Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '51375-fix-activity-pages' into 'master' | Robert Speicher | 2018-09-11 | 2 | -1/+36 |
|\ | |||||
| * | Fix the group and project activity pages | Nick Thomas | 2018-09-11 | 2 | -1/+36 |
* | | Merge branch '51112-add-status-illustration-in-job-api' into 'master' | Kamil Trzciński | 2018-09-11 | 13 | -31/+77 |
|\ \ | |||||
| * | | Add empty state illustration information in job API | Steve Azzopardi | 2018-09-11 | 13 | -31/+77 |
|/ / | |||||
* | | Merge branch 'rails5-deprecation-warnings-ce' into 'master' | Robert Speicher | 2018-09-11 | 4 | -13/+21 |
|\ \ | |||||
| * | | Fix rails 5 deprecation warnings | Jan Provaznik | 2018-09-11 | 4 | -13/+21 |
* | | | Merge branch '50632-combine-color-duplicates' into 'master' | Clement Ho | 2018-09-11 | 29 | -254/+59 |
|\ \ \ | |||||
| * | | | Remove jquery.scss; Combine multiple duplicate grays into global gray variabl... | Annabel Dunstone Gray | 2018-09-11 | 29 | -254/+59 |
* | | | | Merge branch 'frozen-string-enable-vestigial' into 'master' | Stan Hu | 2018-09-11 | 5 | -0/+13 |
|\ \ \ \ | |||||
| * | | | | Enable frozen string in vestigial files | gfyoung | 2018-09-11 | 5 | -0/+13 |
* | | | | | Merge branch '51333-use-rails-root-for-common-metrics-importer' into 'master' | Grzegorz Bizon | 2018-09-11 | 2 | -2/+12 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Use Rails.root for CommonMetricsImporter | Kamil Trzciński | 2018-09-11 | 2 | -2/+12 |
| |/ / / | |||||
* | | | | Merge branch 'sh-support-adding-confirmed-emails' into 'master' | Robert Speicher | 2018-09-11 | 6 | -2/+31 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Add ability to skip user email confirmation with API | Stan Hu | 2018-09-10 | 6 | -2/+31 |
* | | | | Merge branch '50835-add-filtering-sorting-for-labels-on-labels-page' into 'ma... | Dmitriy Zaporozhets | 2018-09-11 | 11 | -2/+142 |
|\ \ \ \ | |||||
| * | | | | Add sort dropdown to project labels page and group labels page | Dmitriy Zaporozhets | 2018-09-10 | 11 | -2/+142 |
* | | | | | Merge branch 'fix-namespace-upload' into 'master' | Kamil Trzciński | 2018-09-11 | 3 | -0/+15 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix workhorse temp path for namespace uploads | Jarka Košanová | 2018-09-11 | 3 | -0/+15 |
* | | | | | Merge branch '49943-resolve-filter-bar-height-changes' into 'master' | Annabel Dunstone Gray | 2018-09-11 | 2 | -2/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Resolve "Filter bar height changes when items are added" | Andrea Leone | 2018-09-11 | 2 | -2/+7 |
|/ / / / / | |||||
* | | | | | Merge branch '51318-project-export-broken-when-avatar-is-set' into 'master' | Grzegorz Bizon | 2018-09-11 | 5 | -12/+38 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | use find instead of reject in avatar export file | James Lopez | 2018-09-11 | 1 | -1/+1 |
| * | | | | fix avatar restorer | James Lopez | 2018-09-11 | 2 | -11/+24 |
| * | | | | add changelog | James Lopez | 2018-09-10 | 1 | -0/+5 |
| * | | | | fix avatar uploader error | James Lopez | 2018-09-10 | 2 | -1/+9 |
* | | | | | Merge branch 'jlenny-UpdateProductDiscoverySteps' into 'master' | Achilleas Pipinellis | 2018-09-11 | 1 | -4/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Update design.md | Mark Pundsack | 2018-09-10 | 1 | -6/+3 |
| * | | | | | Add steps for closing product discovery issuejlenny-UpdateProductDiscoverySteps | Jason Lenny | 2018-08-17 | 1 | -4/+9 |
| * | | | | | Add steps for closing product discovery issue | Jason Lenny | 2018-08-17 | 0 | -0/+0 |
* | | | | | | Merge branch 'sh-test-ldap-clones-via-gitlab-qa' into 'master' | Grzegorz Bizon | 2018-09-11 | 4 | -5/+10 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into sh-test-ldap-clones-via-gitlab-qa | Stan Hu | 2018-08-29 | 826 | -1984/+4602 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add support for testing Git over HTTP with LDAP users | Stan Hu | 2018-08-22 | 4 | -5/+10 |
* | | | | | | | | Merge branch 'rails5-fix-issue-move-service' into 'master' | Grzegorz Bizon | 2018-09-11 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Rails 5: fix issue move service | Jasper Maes | 2018-09-11 | 2 | -1/+7 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'sh-fix-ee-issue-7543' into 'master' | Bob Van Landuyt | 2018-09-11 | 1 | -10/+18 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Add additional stub methods for FakeApplicationSetting | Stan Hu | 2018-09-10 | 1 | -10/+18 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'ml-qa-ldap-admin-license' into 'master' | Stan Hu | 2018-09-10 | 6 | -49/+37 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Enable signing in as admin when adding a license | Mark Lapierre | 2018-09-10 | 6 | -49/+37 |
* | | | | | | | | Merge branch 'leipert-wrap-license-file' into 'master' | Robert Speicher | 2018-09-10 | 1 | -3/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | properly wrap LICENSE file | Lukas Eipert | 2018-09-08 | 1 | -3/+15 |
* | | | | | | | | | Merge branch '51268-clear-in-memory-application-settings-between-examples' in... | Robert Speicher | 2018-09-10 | 3 | -0/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Simplify setting of in_memory_application_settings | Stan Hu | 2018-09-10 | 1 | -1/+1 |
| * | | | | | | | | | Work around migration specs failing due to repository storages not being sele... | Stan Hu | 2018-09-10 | 1 | -0/+4 |
| * | | | | | | | | | Ensure in-memory application settings are cleared before each test | Rémy Coutable | 2018-09-10 | 2 | -0/+8 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'leipert-upgrade-karma' into 'master' | Clement Ho | 2018-09-10 | 2 | -942/+73 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update karma: 2.0.4 -> ^3.0.0 | Lukas Eipert | 2018-09-07 | 2 | -942/+73 |
* | | | | | | | | | | Merge branch 'glui-tooltip' into 'master' | Mike Greiling | 2018-09-10 | 4 | -10/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | add tooltip directive from gitlab-ui | Simon Knox | 2018-09-10 | 4 | -10/+8 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'da-synchronize-the-default-branch-when-updating-a-remote-mirror... | Stan Hu | 2018-09-10 | 6 | -60/+118 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add CHANGELOG | Douglas Barbosa Alexandre | 2018-09-10 | 1 | -0/+5 |