summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add cr remarks57620-add-time-preferences-for-userMałgorzata Ksionek2019-04-023-26/+30
* Update values to boolean in specsMałgorzata Ksionek2019-04-024-5/+5
* Remove defaults from dbMałgorzata Ksionek2019-04-023-6/+10
* Fix static analysisMałgorzata Ksionek2019-04-022-2/+2
* Add changelog entryMałgorzata Ksionek2019-04-022-1/+5
* Refactor view to not duplicate labelsMałgorzata Ksionek2019-04-021-5/+5
* Rename fields for better communicationMałgorzata Ksionek2019-04-026-15/+16
* Add specs and fix viewMałgorzata Ksionek2019-04-022-1/+10
* Update form and modelMałgorzata Ksionek2019-04-023-10/+14
* Add preferences to dbMałgorzata Ksionek2019-04-022-1/+28
* Update externalized stringsMałgorzata Ksionek2019-03-291-0/+12
* Remove eslint commentMałgorzata Ksionek2019-03-291-2/+0
* Extend timezone dropdownEzekiel Kigbo2019-03-293-20/+81
* Udpated user_edit_profile_spec with time preferencesEzekiel Kigbo2019-03-293-4/+40
* Added user time settings fields to profileEzekiel Kigbo2019-03-292-0/+26
* Merge branch '58971-sentry-api-keyerror' into 'master'57970-i18n-linters-eslint-jsSean McGivern2019-03-298-31/+163
|\
| * Handle missing keys in sentry api responseReuben Pereira2019-03-298-31/+163
|/
* Merge branch '50199-quick-actions-refactor' into 'master'Sean McGivern2019-03-2950-1069/+3128
|\
| * Extend quick actions dsl50199-quick-actions-refactorAlexandru Croitor2019-03-2950-1069/+3128
* | Merge branch '59569-some-steps-are-missed-during-review-apps-deployments' int...Robert Speicher2019-03-291-125/+161
|\ \
| * | Add more logging in the Review Apps deployment steps59569-some-steps-are-missed-during-review-apps-deploymentsRémy Coutable2019-03-281-125/+161
* | | Merge branch '59462-applicatonsettings-not-tolerant-of-missing-db-columns' in...Stan Hu2019-03-292-4/+13
|\ \ \
| * | | Apply suggestion to spec/lib/gitlab/current_settings_spec.rb59462-applicatonsettings-not-tolerant-of-missing-db-columnsLin Jen-Shin2019-03-281-1/+1
| * | | Use a Gitlab::FakeApplicationSettings when migrations are pendingRémy Coutable2019-03-262-3/+12
* | | | Merge branch 'ce-1607-elastic_feature_flag_per_group' into 'master'Nick Thomas2019-03-295-2/+4
|\ \ \ \
| * | | | Backport of 1607-elastic_feature_flag_per_groupce-1607-elastic_feature_flag_per_groupMario de la Ossa2019-03-285-2/+4
* | | | | Merge branch 'winh-jest-vue-tips' into 'master'Tim Zallmann2019-03-291-0/+3
|\ \ \ \ \
| * | | | | Disable Vue tips when running Jestwinh-jest-vue-tipsWinnie Hellmann2019-03-281-0/+3
* | | | | | Merge branch 'persist-fulll-ref-path-for-mr-pipelines' into 'master'Kamil Trzciński2019-03-2921-31/+354
|\ \ \ \ \ \
| * | | | | | Create detached merge request pipelinespersist-fulll-ref-path-for-mr-pipelinesShinya Maeda2019-03-2921-31/+354
* | | | | | | Merge branch 'refactor/ce_stubbed_worker' into 'master'Douwe Maan2019-03-297-76/+49
|\ \ \ \ \ \ \
| * | | | | | | Refactor subbed_worker callsrefactor/ce_stubbed_workerJoão Cunha2019-03-287-76/+49
* | | | | | | | Merge branch 'sh-fix-gitaly-find-commit-caching' into 'master'Kamil Trzciński2019-03-298-14/+70
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Guard against nested allows with ref name cachingsh-fix-gitaly-find-commit-cachingStan Hu2019-03-272-1/+2
| * | | | | | | Allow ref name caching CommitService#find_commitStan Hu2019-03-278-14/+69
* | | | | | | | Merge branch 'add-pluck-primary-key' into 'master'Robert Speicher2019-03-29154-164/+169
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a thin encapsulation around .pluck(:id)Nick Thomas2019-03-285-14/+19
| * | | | | | | | Inherit from ApplicationRecord instead of ActiveRecord::BaseNick Thomas2019-03-28149-150/+150
* | | | | | | | | Merge branch 'winh-jest-gon' into 'master'Filipa Lacerda2019-03-295-6/+21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Set gon.ee in Jestwinh-jest-gonWinnie Hellmann2019-03-282-9/+10
| * | | | | | | | | Ignore Jest config from ESLintWinnie Hellmann2019-03-282-1/+10
| * | | | | | | | | Extract IS_EE config helperWinnie Hellmann2019-03-282-5/+10
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '10735-geo-gitlab-revision-can-return-not-consistent-results' in...Sean McGivern2019-03-293-2/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use a fixed git abbrev parameter when we fetch a git revision10735-geo-gitlab-revision-can-return-not-consistent-resultsValery Sizov2019-03-283-2/+7
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'leipert-port-scsslint' into 'master'Filipa Lacerda2019-03-291-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport scss-lint config from EELukas Eipert2019-03-281-1/+3
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '10085-resovle-ee-diff' into 'master'Filipa Lacerda2019-03-291-0/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds EE validators to CE fileSarah Groff Hennigh-Palermo2019-03-291-0/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch 'winh-jest-helpers' into 'master'Phil Hughes2019-03-2911-0/+235
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Copy missing helpers from Karma to JestWinnie Hellmann2019-03-2811-0/+235
| |/ / / / / / / /