summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix missing `Branches` link on the project pagebvl-fix-missing-branches-linkBob Van Landuyt2017-06-292-7/+41
|
* Merge branch 'docs/pat-expiration-date' into 'master'Marcia Ramos2017-06-291-0/+3
|\ | | | | | | | | Clarify the expiration date of PATs See merge request !12339
| * Clarify the expiration date of PATsdocs/pat-expiration-dateAchilleas Pipinellis2017-06-211-0/+3
| | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/22566#note_32336497 [ci skip]
* | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-2915-40/+23
|\ \ | | | | | | | | | | | | | | | | | | refactors Project#search namespace join Closes #30708 See merge request !12091
| * | Removes redundant pending delete checks30708-stop-using-deleted-at-to-filter-namespacesTiago Botelho2017-06-286-27/+10
| | |
| * | Fix current feature related specsTiago Botelho2017-06-2811-21/+21
| | |
| * | Removes pending delete from filter scopesTiago Botelho2017-06-284-7/+6
| | |
| * | refactors Project#search namespace joinTiago Botelho2017-06-281-0/+1
| | |
* | | Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'Robert Speicher2017-06-285-4/+52
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Drop default ORDER scope when calling a find method on a Sortable model Closes #23079 and #34412 See merge request !12499
| * | | Make changelog more descriptivedm-drop-default-scope-on-sortable-findersDouwe Maan2017-06-281-1/+1
| | | | | | | | | | | | | | | | [skip ci]
| * | | Drop default ORDER scope when calling a find method on a Sortable modelDouwe Maan2017-06-285-4/+52
| | | |
* | | | Merge branch 'acet-fix-job-sidebar-overflow' into 'master'Jacob Schatz2017-06-281-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jobs: Fix job sidebar overflow issue. Closes #34080 See merge request !12366
| * | | | Jobs: Fix job sidebar overflow issue.acet-fix-job-sidebar-overflowFatih Acet2017-06-211-0/+1
| | | | |
* | | | | Merge branch 'shell-test-rebuild' into 'master'Robert Speicher2017-06-282-12/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reinstall shell on the test env if it's outdated See merge request !12285
| * | | | | Reinstall shell on the test env if it's outdatedshell-test-rebuildAlejandro Rodríguez2017-06-192-12/+17
| | | | | |
* | | | | | Merge branch 'gitaly-encodings' into 'master'Robert Speicher2017-06-284-11/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix gitaly ref encoding bugs Closes #34156 See merge request !12522
| * | | | | | Fix gitaly ref encoding bugsJacob Vosmaer2017-06-284-11/+44
| | | | | | |
* | | | | | | Merge branch ↵Douwe Maan2017-06-281-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'delete_esperanto_translations_of_json_files_generated_from_po_files' into 'master' Delete esperanto translations of json files generated from po files See merge request !12516
| * | | | | | | delete Esperanto translations of JSON files generated from PO files黄涛2017-06-281-1/+0
| | | | | | | |
* | | | | | | | Merge branch ↵Douwe Maan2017-06-281-24/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'according_to_comments_to_optimize_existing_bulgarian_translation' into 'master' Synchronous bulgarian translation of Zanata See merge request !12504
| * | | | | | | | According to comments to optimize existing bulgarian translation黄涛2017-06-281-24/+32
| | | | | | | | |
* | | | | | | | | Merge branch 'winh-no-current-user-search-bar' into 'master'Clement Ho2017-06-285-7/+80
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add condition if there is a current user to DropdownUser See merge request !12415
| * | | | | | | | | Introduce addClassIfElementExists utilitywinh-no-current-user-search-barwinh2017-06-274-10/+46
| | | | | | | | | |
| * | | | | | | | | Add condition if there is a current user to DropdownUserwinh2017-06-271-2/+5
| | | | | | | | | |
| * | | | | | | | | Add failing test for #34141winh2017-06-271-0/+34
| | | | | | | | | |
* | | | | | | | | | Merge branch 'port-changes-ee-2467' into 'master'Douwe Maan2017-06-284-0/+57
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of "2467-repository-sync-dirty-projects" to CE See merge request !12523
| * | | | | | | | | | Add ProjectWiki#ensure_repositoryport-changes-ee-2467Douglas Barbosa Alexandre2017-06-282-0/+22
| | | | | | | | | | |
| * | | | | | | | | | Add Project#ensure_repositoryDouglas Barbosa Alexandre2017-06-282-0/+35
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'cherry-pick-5ea675be' into 'master'Tim Zallmann2017-06-2831-1985/+6120
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch' See merge request !12454
| * | | | | | | | | | | Fix environment_metrics speccherry-pick-5ea675beJose Ivan Vargas2017-06-261-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'additional-metrics-dashboard' into ↵Phil Hughes2017-06-2630-1984/+6119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28717-additional-metrics-review-branch' Additional metrics dashboard See merge request !11740
* | | | | | | | | | | | Merge branch 'dm-dependency-linker-newlines' into 'master'Robert Speicher2017-06-283-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diff of requirements.txt file by not matching newlines as part of package names Closes #34321 See merge request !12495
| * | | | | | | | | | | | Fix diff of requirements.txt file by not matching newlines as part of ↵dm-dependency-linker-newlinesDouwe Maan2017-06-273-1/+10
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | package names
* | | | | | | | | | | | Merge branch 'cherry-pick-42d87f21' into 'master'Clement Ho2017-06-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update guide for 9.3 See merge request !12460
| * | | | | | | | | | | | Merge branch 'update-guides-for-9-3' into '9-3-stable'cherry-pick-42d87f21Clement Ho2017-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update guide for 9.3 See merge request !12038
* | | | | | | | | | | | | Merge branch 'bvl-fix-ldap-login' into 'master'Douwe Maan2017-06-282-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix setting `last_credential_check_at` on LDAP-login See merge request !12507
| * | | | | | | | | | | | | Fix setting `last_credential_check` on LDAP-loginbvl-fix-ldap-loginBob Van Landuyt2017-06-282-1/+11
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'profile-settings-width' into 'master'Annabel Dunstone Gray2017-06-2815-40/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added limited width to profile settings Closes #20918 See merge request !12386
| * | | | | | | | | | | | | Added limited width to profile settingsprofile-settings-widthPhil Hughes2017-06-2315-40/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #20918
* | | | | | | | | | | | | | Merge branch 'rc/a-better-stub-env' into 'master'Grzegorz Bizon2017-06-281-9/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a slightly cleaner approach to stub ENV See merge request !12481
| * | | | | | | | | | | | | | Use a slightly cleaner approach to stub ENVrc/a-better-stub-envRémy Coutable2017-06-281-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch 'stop-notification-recipient-service-modifying-participants' ↵Grzegorz Bizon2017-06-283-7/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Ensure NotificationRecipientService doesn't modify participants See merge request !12517
| * | | | | | | | | | | | | | | Ensure NotificationRecipientService doesn't modify participantsSean McGivern2017-06-283-7/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though it does modify the participants of the notification target in some cases, this should have been safe, as different workers are responsible for creating the notifications for each target. However, this is at best confusing, and we should ensure we don't do that.
* | | | | | | | | | | | | | | | Merge branch 'fix-find-file-breadcrumbs' into 'master'Tim Zallmann2017-06-282-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix find file breadcrumb styling Closes #34427 See merge request !12510
| * | | | | | | | | | | | | | | Fix find file breadcrumb stylingfix-find-file-breadcrumbsPhil Hughes2017-06-282-1/+3
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34427
* | | | | | | | | | | | | | | Merge branch 'issue-boards-closed-list-all' into 'master'Sean McGivern2017-06-283-3/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue boards closed list not listing all issues Closes #33850 See merge request !12271
| * | | | | | | | | | | | | | | Fixed issue boards closed list not listing all issuesPhil Hughes2017-06-283-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression caused by the backlog list being re-added Closes #33850
* | | | | | | | | | | | | | | | Merge branch 'fix-duplicate-shared-examples' into 'master'Grzegorz Bizon2017-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move shared examples to their correct location See merge request !12488
| * | | | | | | | | | | | | | | Move share examples to their correct locationfix-duplicate-shared-examplesRémy Coutable2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | Merge branch 'docs/introduce-ee-unified-docs' into 'master'Achilleas Pipinellis2017-06-281-8/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce unified docs to CE landing page See merge request !12482