summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Run mysql tests on stable preperation branches like 9-3-stable-patch-2jej/run-mysql-tests-on-stable-preparation-branchesJames Edwards-Jones2017-06-291-1/+1
* Merge branch 'fix-34417' into 'master'Sean McGivern2017-06-293-17/+48
|\
| * Add tests for project import state transition: [:started] => [:finished]fix-34417Douglas Barbosa Alexandre2017-06-281-0/+34
| * Add CHANGELOGDouglas Barbosa Alexandre2017-06-281-0/+4
| * Perform housekeeping only when an import of a fresh project is completedDouglas Barbosa Alexandre2017-06-281-17/+10
* | Merge branch 'postreceive-gl-repository' into 'master'Sean McGivern2017-06-292-43/+16
|\ \
| * | Use gl_repository exclusively as identifier on post-receivepostreceive-gl-repositoryAlejandro Rodríguez2017-06-272-43/+16
* | | Merge branch 'feature/sm/34314-add-hasvariable-concern' into 'master'Kamil Trzciński2017-06-294-56/+69
|\ \ \
| * | | Improve small thingsfeature/sm/34314-add-hasvariable-concernShinya Maeda2017-06-282-4/+2
| * | | Remove PoC specShinya Maeda2017-06-281-34/+0
| * | | Add a test for checking validates :key does not override by concernShinya Maeda2017-06-281-0/+34
| * | | DecuplinShinya Maeda2017-06-284-56/+71
* | | | Merge branch 'docs/pat-expiration-date' into 'master'Marcia Ramos2017-06-291-0/+3
|\ \ \ \
| * | | | Clarify the expiration date of PATsdocs/pat-expiration-dateAchilleas Pipinellis2017-06-211-0/+3
* | | | | Merge branch '30708-stop-using-deleted-at-to-filter-namespaces' into 'master'Douwe Maan2017-06-2915-40/+23
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | Make changelog more descriptivedm-drop-default-scope-on-sortable-findersDouwe Maan2017-06-281-1/+1
| * | | | | | 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.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 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 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