summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Correct file-header spacing on compare page56938-diff-file-headers-on-compare-not-quite-rightSam Bigelow2019-02-058-19/+40
| | | | | Use special classes when is_compare, similar to is_commit. Default expectation is diff is being viewed in MR
* Merge branch 'ssh-host-key-indifferent' into 'master'Stan Hu2019-02-042-0/+24
|\ | | | | | | | | Allow SshHostKey.find_by to accept string keys See merge request gitlab-org/gitlab-ce!24903
| * Allow SshHostKey.find_by to accept string keysNick Thomas2019-02-042-0/+24
| |
* | Merge branch 'adriel-handle-echarts-resize-events' into 'master'Phil Hughes2019-02-045-30/+86
|\ \ | | | | | | | | | | | | Handle metrics graph resize events See merge request gitlab-org/gitlab-ce!24649
| * | Handle window and container resize eventsAdriel Santiago2019-02-045-30/+86
| |/ | | | | | | Resizes metrics graph on window and sidebard width changes
* | Merge branch 'fe-api-group-members' into 'master'Phil Hughes2019-02-042-0/+23
|\ \ | | | | | | | | | | | | Add groupMembers to api.js See merge request gitlab-org/gitlab-ce!24892
| * | Add groupMembers to api.jsPaul Slaughter2019-02-032-0/+23
| | |
* | | Merge branch 'tz-gitlab-ui-include' into 'master'Phil Hughes2019-02-043-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gitlab-ui update with the new charting setup Closes #56987 See merge request gitlab-org/gitlab-ce!24807
| * | | gitlab-ui update with the new charting setupTim Zallmann2019-02-043-6/+6
|/ / /
* | | Merge branch 'fj-regression-external-wiki-url' into 'master'Rémy Coutable2019-02-043-9/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Changed external wiki query method to prevent attribute caching Closes #57228 See merge request gitlab-org/gitlab-ce!24907
| * | | Changed external wiki query method to prevent attribute cachingFrancisco Javier López2019-02-043-9/+9
| | | |
* | | | Merge branch 'gt-externalize-app-views-instance_statistics' into 'master'Fatih Acet2019-02-046-10/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Externalize strings from `/app/views/instance_statistics` See merge request gitlab-org/gitlab-ce!24809
| * | | | Externalize strings from `/app/views/instance_statistics`George Tsiolis2019-02-046-10/+42
| | | | |
* | | | | Merge branch 'update-workhorse-8-2-0' into 'master'Sean McGivern2019-02-042-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Workhorse to v8.2.0 See merge request gitlab-org/gitlab-ce!24909
| * | | | | Update Workhorse to v8.2.0Nick Thomas2019-02-042-1/+6
| | | | | |
* | | | | | Merge branch 'fe-update-common-styles' into 'master'Annabel Dunstone Gray2019-02-041-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace h-13em with h-12em See merge request gitlab-org/gitlab-ce!24895
| * | | | | | Replace h-13em with h-12emPaul Slaughter2019-02-031-1/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ce-mr-widget-service-endpoints-method' into 'master'Phil Hughes2019-02-041-3/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | CE Port of "Extract extension method from mr_widget_options" See merge request gitlab-org/gitlab-ce!24891
| * | | | | Extract extension method from mr_widget_optionsPaul Slaughter2019-02-031-3/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | **Why?** - This fixes the CE/EE difference - More endpoints will be added in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9168
* | | | | Merge branch ↵Rémy Coutable2019-02-043-59/+76
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '46448-add-timestamps-for-each-stage-of-gitlab-rake-gitlab-backup-restore' into 'master' Resolve "Add timestamps for each stage of gitlab-rake gitlab:backup:restore" Closes #46448 See merge request gitlab-org/gitlab-ce!19684
| * \ \ \ \ Merge branch 'master' into ↵Rémy Coutable2019-02-0411599-145620/+755016
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | '46448-add-timestamps-for-each-stage-of-gitlab-rake-gitlab-backup-restore' # Conflicts: # spec/tasks/gitlab/backup_rake_spec.rb
| * | | | | Add timestamps to gitlab-rake gitlab:backup:restoreWill Chandler2018-06-143-58/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a new method 'puts_time' that prepends the time of a message when printing it. All instances of 'progress.puts' in the gitlab:backup:restore tasks are replaced with puts_time. Example output: 2018-06-03 16:33:25 -0400 -- Restoring uploads .. Closes #46448
* | | | | | Merge branch '51759-filter-by-language' into 'master'Andreas Brandl2019-02-046-0/+74
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add programming language filtering to `/projects` Closes #51759 See merge request gitlab-org/gitlab-ce!24377
| * | | | | Add programming language filtering to `/projects`Dylan MacKenzie2019-02-046-0/+74
|/ / / / /
* | | | | Merge branch 'fine-tune-review-app-resource-requests' into 'master'Rémy Coutable2019-02-041-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fine-tune Review Apps pod resource requests See merge request gitlab-org/gitlab-ce!24630
| * | | | | Only use 2 replicas for nginx-ingress.controllerRémy Coutable2019-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Don't install Prometheus in Review AppsRémy Coutable2019-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fine-tune Review Apps pod resource requestsRémy Coutable2019-02-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'sh-fix-oauth2-callback-caps' into 'master'Douglas Barbosa Alexandre2019-02-042-1/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downcase aliased OAuth2 callback providers Closes #57156 See merge request gitlab-org/gitlab-ce!24877
| * | | | | Downcase aliased OAuth2 callback providersStan Hu2019-02-012-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users may specify an OAuth2 callback with a custom name, such as AWSCognito, but Rails will reject this with the following message: ``` 'import/AWSCognito' is not a supported controller name. This can lead to potential routing problems. See http://guides.rubyonrails.org/routing.html#specifying-a-controller-to-use ``` To avoid these errors, we can just downcase all the provider names. Note that this will make it impossible to specify a duplicate name with different cases. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57156
* | | | | | Merge branch 'sh-fix-detect-host-keys' into 'master'Nick Thomas2019-02-043-1/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Detect Host Keys not working Closes #56855 See merge request gitlab-org/gitlab-ce!24884
| * | | | | | Fix SSH Detect Host Keys not workingStan Hu2019-02-033-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a change in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24245, the Detect Host Key feature in the SSH mirroring stopped working. `SshHostKey#primary_key` was being used instead of the hard-coded `:id`. However, `SshHostKey#find_by` was expecting the symbolized `:id` rather than the string `id`, so it could never find the host key it was supposed to update. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56855
* | | | | | | Merge branch 'patch-29' into 'master'Sean McGivern2019-02-042-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accured -> occurred, as suggested in… See merge request gitlab-org/gitlab-ce!23629
| * | | | | | | accured -> occurred, as suggested in…Yaron Shahrabani2019-02-042-4/+4
|/ / / / / / /
* | | | | | | Merge branch '55199-schema-and-model-changes' into 'master'Sean McGivern2019-02-047-9/+278
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DB and model changes for Sentry project selection dropdown See merge request gitlab-org/gitlab-ce!24677
| * | | | | | | DB and model changes for Sentry project selection dropdownReuben Pereira2019-02-047-9/+278
|/ / / / / / /
* | | | | | | Merge branch '49388-refactor' into 'master'Grzegorz Bizon2019-02-041-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor helper in environments controller for clarity See merge request gitlab-org/gitlab-ce!24781
| * | | | | | | Refactor envs helper for claritysyasonik2019-01-291-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'ee-1979-1-3-fix-approvals-required' into 'master'Sean McGivern2019-02-042-4/+43
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consume jobs from dead and retry queues See merge request gitlab-org/gitlab-ce!24881
| * | | | | | | | Consume remaining MigrateApproverToApprovalRulesInBatchMark Chao2019-02-022-4/+43
| | |_|/ / / / / | |/| | | | | | | | | | | | | | Allow `steal` to handle dead jobs.
* | | | | | | | Merge branch 'adriel-use-echarts-metrics-dashboard' into 'master'Phil Hughes2019-02-043-26/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use ECharts for metrics dashboard graphs See merge request gitlab-org/gitlab-ce!24648
| * | | | | | | | Use ECharts for metrics dashboardAdriel Santiago2019-02-013-26/+17
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Update metrics dashboard to support GitLab UI area chart changes
* | | | | | | | Merge branch 'issue_55744' into 'master'Sean McGivern2019-02-046-3/+71
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix template labels Closes #55744 See merge request gitlab-org/gitlab-ce!24803
| * | | | | | | | Fix template labelsFelipe Artur2019-02-046-3/+71
|/ / / / / / / /
* | | | | | | | Merge branch ↵Filipa Lacerda2019-02-047-22/+73
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '50521-block-emojis-and-symbol-characters-from-user-s-full-names-2' into 'master' Resolve "Block emojis and symbol characters from user's full names" Closes #50521 See merge request gitlab-org/gitlab-ce!24523
| * | | | | | | | Block emojis from user nameMartin Wortschack2019-02-017-22/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use JS regex for emoji validation - Add test for blocking emojis in full name - Fix existing tests for user status that failed locally
* | | | | | | | | Merge branch 'if-7693-smartcard_ldap_integration-ee_backport' into 'master'Dmitriy Zaporozhets2019-02-042-8/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of ee/9235: Add LDAP integration to smartcard authentication See merge request gitlab-org/gitlab-ce!24704
| * | | | | | | | | Backport of ee/9235: Add LDAP integration to smartcard authenticationImre Farkas2019-01-272-8/+13
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-rubocop' into 'master'Rémy Coutable2019-02-043-11/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ReturnInVoidContext rubocop offense See merge request gitlab-org/gitlab-ce!24857
| * | | | | | | | | | Fix warning already initialized constantSemyon Pupkov2019-02-011-1/+1
| | | | | | | | | | |
View Lorry Controller Status