Commit graph

17 commits

Author SHA1 Message Date
GitLab Bot
5564275a0b Add latest changes from gitlab-org/gitlab@master 2020-02-06 12:10:29 +00:00
GitLab Bot
506159637d Add latest changes from gitlab-org/gitlab@master 2020-01-06 15:07:26 +00:00
GitLab Bot
784fae4b9d Add latest changes from gitlab-org/gitlab@master 2019-12-12 12:07:33 +00:00
gfyoung
93a44e135b Add some frozen string to spec/**/*.rb
Adds frozen string to the following:

* spec/bin/**/*.rb
* spec/config/**/*.rb
* spec/controllers/**/*.rb

xref https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-04-15 10:17:05 +00:00
Fabian Schneider
a32fd49dd8 Move language setting to preferences 2019-02-20 22:58:53 +00:00
Fabian Schneider
27f7771ae1 Add setting for first day of the week 2019-02-06 17:33:56 +01:00
blackst0ne
b44a2c801a Update specs to rails5 format
Updates specs to use new rails5 format.

The old format:
`get :show, { some: params }, { some: headers }`

The new format:
`get :show, params: { some: params }, headers: { some: headers }`
2018-12-19 10:04:31 +11:00
Jasper Maes
de399c4a49 Fix deprecation: Comparing equality between ActionController::Parameters and a Hash is deprecated 2018-12-16 13:45:19 +01:00
Annabel Dunstone Gray
9b177bb7c9 Revert "Merge branch 'revert-f2421b2b' into 'master'"
This reverts merge request !14148
2017-09-11 15:44:42 +00:00
Rubén Dávila
52a2423e37 Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'"
This reverts merge request !13619
2017-09-08 14:48:44 +00:00
Rubén Dávila
6c49a62800 Restore some changes from !9199 2017-09-06 12:54:09 -05:00
James Lopez
04bb82c8b8 update preferences controller 2017-06-23 11:41:41 +02:00
Annabel Dunstone Gray
c780ad0e92 Remove all instances of theme_id; require downtime 2017-02-15 13:31:18 -06:00
Robert Speicher
94eff65569 Fix Style/SpaceInsideHashLiteralBraces cop violations
These fixes were performed automatically by Rubocop's `-a` flag.
2015-06-22 14:41:00 -04:00
Robert Speicher
1562f017b6 Spec the failure cases for PreferencesController#update 2015-06-13 17:59:12 -04:00
Robert Speicher
2bc4fd2d04 Add dashboard attribute to User model 2015-06-13 17:59:11 -04:00
Robert Speicher
821fc4b034 Add Profiles::PreferencesController 2015-06-13 17:58:15 -04:00