summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Allow JIRA to login using email and API tokenissue_49936Felipe Artur2018-09-132-3/+9
* Merge branch 'rails5-deprecation-warnings-ce' into 'master'Robert Speicher2018-09-114-13/+21
|\
| * Fix rails 5 deprecation warningsJan Provaznik2018-09-114-13/+21
* | Merge branch '50632-combine-color-duplicates' into 'master'Clement Ho2018-09-1129-254/+59
|\ \
| * | Remove jquery.scss; Combine multiple duplicate grays into global gray variabl...Annabel Dunstone Gray2018-09-1129-254/+59
* | | Merge branch 'frozen-string-enable-vestigial' into 'master'Stan Hu2018-09-115-0/+13
|\ \ \
| * | | Enable frozen string in vestigial filesgfyoung2018-09-115-0/+13
* | | | Merge branch '51333-use-rails-root-for-common-metrics-importer' into 'master'Grzegorz Bizon2018-09-112-2/+12
|\ \ \ \
| * | | | Use Rails.root for CommonMetricsImporterKamil Trzciński2018-09-112-2/+12
| |/ / /
* | | | Merge branch 'sh-support-adding-confirmed-emails' into 'master'Robert Speicher2018-09-116-2/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add ability to skip user email confirmation with APIStan Hu2018-09-106-2/+31
* | | | Merge branch '50835-add-filtering-sorting-for-labels-on-labels-page' into 'ma...Dmitriy Zaporozhets2018-09-1111-2/+142
|\ \ \ \
| * | | | Add sort dropdown to project labels page and group labels pageDmitriy Zaporozhets2018-09-1011-2/+142
* | | | | Merge branch 'fix-namespace-upload' into 'master'Kamil Trzciński2018-09-113-0/+15
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix workhorse temp path for namespace uploadsJarka Košanová2018-09-113-0/+15
* | | | | Merge branch '49943-resolve-filter-bar-height-changes' into 'master'Annabel Dunstone Gray2018-09-112-2/+7
|\ \ \ \ \
| * | | | | Resolve "Filter bar height changes when items are added"Andrea Leone2018-09-112-2/+7
|/ / / / /
* | | | | Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master'Grzegorz Bizon2018-09-115-12/+38
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | use find instead of reject in avatar export fileJames Lopez2018-09-111-1/+1
| * | | | fix avatar restorerJames Lopez2018-09-112-11/+24
| * | | | add changelogJames Lopez2018-09-101-0/+5
| * | | | fix avatar uploader errorJames Lopez2018-09-102-1/+9
* | | | | Merge branch 'jlenny-UpdateProductDiscoverySteps' into 'master'Achilleas Pipinellis2018-09-111-4/+6
|\ \ \ \ \
| * | | | | Update design.mdMark Pundsack2018-09-101-6/+3
| * | | | | Add steps for closing product discovery issuejlenny-UpdateProductDiscoveryStepsJason Lenny2018-08-171-4/+9
| * | | | | Add steps for closing product discovery issueJason Lenny2018-08-170-0/+0
* | | | | | Merge branch 'sh-test-ldap-clones-via-gitlab-qa' into 'master'Grzegorz Bizon2018-09-114-5/+10
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sh-test-ldap-clones-via-gitlab-qaStan Hu2018-08-29826-1984/+4602
| |\ \ \ \ \ \
| * | | | | | | Add support for testing Git over HTTP with LDAP usersStan Hu2018-08-224-5/+10
* | | | | | | | Merge branch 'rails5-fix-issue-move-service' into 'master'Grzegorz Bizon2018-09-112-1/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Rails 5: fix issue move serviceJasper Maes2018-09-112-1/+7
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-fix-ee-issue-7543' into 'master'Bob Van Landuyt2018-09-111-10/+18
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add additional stub methods for FakeApplicationSettingStan Hu2018-09-101-10/+18
|/ / / / / / /
* | | | | | | Merge branch 'ml-qa-ldap-admin-license' into 'master'Stan Hu2018-09-106-49/+37
|\ \ \ \ \ \ \
| * | | | | | | Enable signing in as admin when adding a licenseMark Lapierre2018-09-106-49/+37
* | | | | | | | Merge branch 'leipert-wrap-license-file' into 'master'Robert Speicher2018-09-101-3/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | properly wrap LICENSE fileLukas Eipert2018-09-081-3/+15
* | | | | | | | | Merge branch '51268-clear-in-memory-application-settings-between-examples' in...Robert Speicher2018-09-103-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simplify setting of in_memory_application_settingsStan Hu2018-09-101-1/+1
| * | | | | | | | | Work around migration specs failing due to repository storages not being sele...Stan Hu2018-09-101-0/+4
| * | | | | | | | | Ensure in-memory application settings are cleared before each testRémy Coutable2018-09-102-0/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'leipert-upgrade-karma' into 'master'Clement Ho2018-09-102-942/+73
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update karma: 2.0.4 -> ^3.0.0Lukas Eipert2018-09-072-942/+73
* | | | | | | | | | Merge branch 'glui-tooltip' into 'master'Mike Greiling2018-09-104-10/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | add tooltip directive from gitlab-uiSimon Knox2018-09-104-10/+8
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'da-synchronize-the-default-branch-when-updating-a-remote-mirror...Stan Hu2018-09-106-60/+118
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Add CHANGELOGDouglas Barbosa Alexandre2018-09-101-0/+5
| * | | | | | | | | Synchronize the default branch when updating a remote mirrorDouglas Barbosa Alexandre2018-09-105-60/+113
* | | | | | | | | | Merge branch 'ce-7471-extract-ee-specific-models-from-all_models-yml' into 'm...Robert Speicher2018-09-101-16/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make spec/lib/gitlab/import_export/all_models.yml EE-readyRémy Coutable2018-09-101-16/+26