summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix a bug where an invalid sort param value was passed to Gitaly34280-gitalyclient-sort_by_param-invalid-sort_by-key-recently_updatedAlejandro Rodríguez2017-06-283-1/+50
* Merge branch 'gitaly-encodings' into 'master'Robert Speicher2017-06-284-11/+44
|\
| * Fix gitaly ref encoding bugsJacob Vosmaer2017-06-284-11/+44
* | Merge branch 'delete_esperanto_translations_of_json_files_generated_from_po_f...Douwe Maan2017-06-281-1/+0
|\ \
| * | delete Esperanto translations of JSON files generated from PO files黄涛2017-06-281-1/+0
* | | Merge branch 'according_to_comments_to_optimize_existing_bulgarian_translatio...Douwe Maan2017-06-281-24/+32
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | Fix environment_metrics speccherry-pick-5ea675beJose Ivan Vargas2017-06-261-1/+1
| * | | | | | Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-re...Phil Hughes2017-06-2630-1984/+6119
* | | | | | | 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...dm-dependency-linker-newlinesDouwe Maan2017-06-273-1/+10
* | | | | | | | Merge branch 'cherry-pick-42d87f21' into 'master'Clement Ho2017-06-281-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge branch 'update-guides-for-9-3' into '9-3-stable'cherry-pick-42d87f21Clement Ho2017-06-271-2/+2
* | | | | | | | | Merge branch 'bvl-fix-ldap-login' into 'master'Douwe Maan2017-06-282-1/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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 settingsprofile-settings-widthPhil Hughes2017-06-2315-40/+56
* | | | | | | | | | Merge branch 'rc/a-better-stub-env' into 'master'Grzegorz Bizon2017-06-281-9/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use a slightly cleaner approach to stub ENVrc/a-better-stub-envRémy Coutable2017-06-281-9/+27
* | | | | | | | | | | Merge branch 'stop-notification-recipient-service-modifying-participants' int...Grzegorz Bizon2017-06-283-7/+49
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ensure NotificationRecipientService doesn't modify participantsSean McGivern2017-06-283-7/+49
* | | | | | | | | | | | Merge branch 'fix-find-file-breadcrumbs' into 'master'Tim Zallmann2017-06-282-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Fix find file breadcrumb stylingfix-find-file-breadcrumbsPhil Hughes2017-06-282-1/+3
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'issue-boards-closed-list-all' into 'master'Sean McGivern2017-06-283-3/+15
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed issue boards closed list not listing all issuesPhil Hughes2017-06-283-3/+15
* | | | | | | | | | | | Merge branch 'fix-duplicate-shared-examples' into 'master'Grzegorz Bizon2017-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Move share examples to their correct locationfix-duplicate-shared-examplesRémy Coutable2017-06-271-1/+1
* | | | | | | | | | | | | Merge branch 'docs/introduce-ee-unified-docs' into 'master'Achilleas Pipinellis2017-06-281-8/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | adjust EE landing page to unify CE and EE docsdocs/introduce-ee-unified-docsMarcia Ramos2017-06-271-8/+20
* | | | | | | | | | | | | | Merge branch 'patch-24' into 'master'Rémy Coutable2017-06-281-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix steps numberingNitin Madhok2017-06-271-3/+3
* | | | | | | | | | | | | | | Merge branch 'dz-cleanup-codeclimate-json' into 'master'Kamil Trzciński2017-06-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Improve sed regex for codeclimate ci jobdz-cleanup-codeclimate-jsonDmitriy Zaporozhets2017-06-271-1/+1
| * | | | | | | | | | | | | | Update .gitlab-ci.ymlDmitriy Zaporozhets2017-06-270-0/+0
| * | | | | | | | | | | | | | Remove unused data from code climate artifactDmitriy Zaporozhets2017-06-271-0/+1
| | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '34430-fix-double-escape-comment-edit' into 'master'Phil Hughes2017-06-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Remove unnecessary call to `_.escape`34430-fix-double-escape-comment-editkushalpandya2017-06-281-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'gitlab-git-test-in-tree' into 'master'Rémy Coutable2017-06-2813-2/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Vendor the gitlab-git-test repoJacob Vosmaer (GitLab)2017-06-2813-2/+105
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'submodules-private' into 'master'Sean McGivern2017-06-283-41/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Make Gitlab::Ggit::Repository#submodules privateJacob Vosmaer2017-06-273-41/+30
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '34023-navigation-sidebar' into 'master'34424-default-removing-source-branch-in-merge-request-for-non-long-running-branchPhil Hughes2017-06-2813-12/+624
|\ \ \ \ \ \ \ \ \ \ \ \ \