Commit graph

128 commits

Author SHA1 Message Date
Z.J. van de Weg
091c260812 Improve readability and add test 2017-03-23 13:35:20 +01:00
Robert Speicher
f592cae129 Merge branch 'sh-fix-admin-application-settings' into 'master'
Fix Error 500 when application settings are saved

Closes  and 

See merge request 
2017-03-21 07:21:01 +00:00
Toon Claes
dd3d62b626 Make feature spec more robust
Ensure the correct "Public" radio is selected by choosing it on ID.
2017-03-20 22:05:02 +01:00
Stan Hu
681af5bc4f Fix Error 500 when application settings are saved
Due to a Rails bug, fetching the application settings from Redis
may prevent the attribute methods from being loaded for the `ApplicationSetting`
model. More details here: https://github.com/rails/rails/issues/27348

There was also a secondary problem introduced by overriding these
association methods which caused all default visibility levels to be
set to `nil`. Before, the previous implementation allowed the string
"20" to be saved as an integer, while now a table lookup happens
before that. We fix this by enforcing the integer value in the
controller and default to PRIVATE.

Closes 
2017-03-18 15:39:48 -07:00
Kamil Trzciński
12dd5ac221 All CI offline migrations 2017-03-17 23:06:11 +00:00
Tiago Botelho
005749a616 apply codestyle and implementation changes to the respective feature code 2017-03-06 19:18:26 +00:00
Tiago Botelho
2b474dc2b2 refactors finder and correlated code 2017-03-01 13:11:11 +00:00
Tiago Botelho
9f2e4742e3 applies relevant changes to the code and code structure 2017-02-28 22:15:40 +00:00
Tiago Botelho
f0ea7130f7 refactors documentation and personal access tokens form to not allow admins to generate non impersionation tokens 2017-02-28 22:15:40 +00:00
Simon Vocella
c2b1cdef7e add admin panel for personal access tokens 2017-02-28 22:15:39 +00:00
Jan Christophersen
150c363752 Add the username of the current user to the HTTP(S) clone URL 2017-02-24 16:35:34 +01:00
Clement Ho
59010d8f82 Fix grammer issue in admin/runners 2017-02-17 14:36:49 -06:00
Eric Eastwood
ae69e8764c Restore pagination to admin abuse reports 2017-02-16 17:02:58 -06:00
Felipe Artur
d1ecbd6ce8 Fix admin_labels_spec.rb transient failure 2017-02-10 11:44:00 -02:00
Jose Ivan Vargas
426680def4 Backport of the frontend view, including tests 2017-02-06 16:17:46 -06:00
Filipa Lacerda
c5f5ce8807 Fix broken tests
Rename Build to Job

Replace "Builds" by "Jobs" and fix broken specs

Replace "Builds" by "Jobs"

Fix broken spinach test

Fix broken test

Remove `˙` at the beginning of the file

Fix broken spinach test

Fix broken tests

Changes after review
2017-02-03 09:43:04 +00:00
Grzegorz Bizon
632c2939bb Revert "Merge branch 'revert-9cac0317' into 'master' "
This reverts commit c20934869f, reversing
changes made to 4b7ec44b91.
2017-01-23 16:35:24 +01:00
Semyon Pupkov
a92c0f9c11 Use archived trait for project in specs instead model column 2017-01-22 19:19:45 +05:00
Grzegorz Bizon
baeaa97ef4 Revert "Merge branch 'dont-persist-application-settings-in-test-env' into 'master'"
This reverts merge request 
2017-01-21 22:55:35 +00:00
Robert Speicher
9cac031769 Merge branch 'dont-persist-application-settings-in-test-env' into 'master'
Don't persist application settings in test env

See merge request 
2017-01-20 15:42:54 +00:00
Rémy Coutable
3608a1e875 Merge branch 'move-admin-groups-spinach-test-to-rspec' into 'master'
Move admin groups spinach tests to rspec

See merge request 
2017-01-15 23:07:16 +00:00
Rémy Coutable
f6cc29ed83 Don't persist ApplicationSetting in test env
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-01-15 01:07:29 -05:00
Rémy Coutable
2c58d5101c Merge branch 'move-admin-users-spinach-tests-to-rspec' into 'master'
Move admin users spinach tests to rspec

See merge request 
2017-01-13 04:50:48 +00:00
Semyon Pupkov
4141e30505 Move admin deploy keys spinach to rspec 2017-01-03 13:53:42 +05:00
Semyon Pupkov
74c817c7cb Tiny refactoring example in admin users feature spec 2017-01-02 16:20:22 +05:00
Semyon Pupkov
1591c90f7b Move admin users spinach tests to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2017-01-02 16:07:11 +05:00
James Gregory
b21024684b Merged the 'groups' and 'projects' tabs when viewing user profiles 2016-12-29 22:42:16 +00:00
Valery Sizov
684536321c Fix: Admin group show page does not work 2016-12-28 15:34:12 +02:00
Semyon Pupkov
cec230bdf5 Move admin groups spinach tests to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-27 00:36:33 +05:00
Rémy Coutable
ad1a1d976c Merge branch 'move-admin-projects-spinach-tests-to-rspec' into 'master'
Move admin projects spinach tests to RSpec

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

See merge request 
2016-12-20 12:20:50 +00:00
Grzegorz Bizon
52278412c7 Merge branch 'zj-kamil-slack-slash-commands' into 'master'
Slack slash commands

## What does this MR do?

Implement Slack Slash Commands by utilizing generalized Mattermost presenter to fulfill Slack requirements.

## Why was this MR needed?

We want to expose Slack Slash Commands as a first-class service.

## What are the relevant issue numbers?

Supersedes   
Closes 

See merge request 
2016-12-20 09:41:37 +00:00
Rémy Coutable
4298209a7a Merge branch 'move-admin-appearance-feature-to-rspec' into 'master'
Move Admin Appearance spinach feature to RSpec

Part of 

See merge request 
2016-12-19 20:44:58 +00:00
jurre
bf6b107852 Move admin broadcast messages spinach feature to rspec 2016-12-19 17:43:24 +01:00
jurre
a0c48ec62b Move Admin Appearance spinach feature to rspec 2016-12-19 17:41:54 +01:00
Rémy Coutable
60f61096e1 Merge branch 'move-admin-label-spinach-test-to-rspec' into 'master'
Move admin labels spinach test to RSpec

Part of 

See merge request 
2016-12-19 15:31:28 +00:00
Semyon Pupkov
ad39831049 Move admin projects spinach tests to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-19 19:33:11 +05:00
Semyon Pupkov
561ed7b9f9 Move admin labels spinach test to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-19 13:47:55 +05:00
Rémy Coutable
4f77a3f81e Merge branch 'move-admin-application-spinach-test-to-rspec' into 'master'
Move admin application spinach test to RSpec

Part of 

See merge request 
2016-12-19 08:33:44 +00:00
Kamil Trzcinski
f5ff372140
Fix failures 2016-12-18 23:34:40 +01:00
Kamil Trzcinski
f9023adbad
Fix spec failures 2016-12-18 23:32:53 +01:00
Semyon Pupkov
5a6252ff4a Move admin application spinach test to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-17 17:45:10 +05:00
Semyon Pupkov
a871746e8a Move admin deploy keys spinach test to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-17 17:36:36 +05:00
Douglas Barbosa Alexandre
8dc7ffa02e Fix spec/features/admin/admin_active_tab_spec.rb 2016-12-15 22:35:44 -02:00
Rémy Coutable
a2ee24dc59 Merge branch 'move-admin-active-tab-spinach-tests-to-rspec' into 'master'
Move admin active tab spinach tests to RSpec

See merge request 
2016-12-15 16:52:15 +00:00
Sean McGivern
b70b962892 Merge branch 'dz-fix-admin-routes' into 'master'
Add support for nested groups to admin routing

See merge request 
2016-12-14 15:09:54 +00:00
jurre
0469e7dffd Move admin settings spinach feature to rspec 2016-12-13 17:13:21 +01:00
Semyon Pupkov
4bb3c46447 Move admin active tab spinach tests to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-12 15:01:44 +05:00
Dmitriy Zaporozhets
d8b7df3cbc Add support for nested groups to admin routing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-12-11 10:30:10 +02:00
Rémy Coutable
911c1601f8 Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master'
Move admin hooks spinach to RSpec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

See merge request 
2016-12-07 11:47:30 +00:00
Semyon Pupkov
d33b22f238 Move admin hooks spinach to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-12-06 22:58:15 +05:00