summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove Repository#search_filesremove-git-search-filesJacob Vosmaer2017-07-142-125/+0
* Merge branch 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes'...Grzegorz Bizon2017-07-142-9/+1
|\
| * Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedulefix/sm/32032-remove-the-rest-of-trigger_schedule-related-codesShinya Maeda2017-07-132-9/+1
* | Merge branch '19629-remove-inactive-tokens-list' into 'master'Filipa Lacerda2017-07-144-29/+18
|\ \
| * | Update test description to reflect behaviour19629-remove-inactive-tokens-listkushalpandya2017-07-141-1/+1
| * | Add changelog entrykushalpandya2017-07-141-0/+4
| * | Update tests to cover removal of inactive tokens tablekushalpandya2017-07-142-9/+13
| * | Remove inactive tokens tablekushalpandya2017-07-141-19/+0
* | | Merge branch 'revert-73579e66' into 'master'Grzegorz Bizon2017-07-145-52/+4
|\ \ \
| * | | Revert "Merge branch 'revert-2c879643' into 'master'"Sean McGivern2017-07-145-52/+4
|/ / /
* | | Merge branch 'backport-ee-mysql2-version' into 'master'Sean McGivern2017-07-142-3/+3
|\ \ \
| * | | Update the mysql2 gem to v0.4.5Nick Thomas2017-07-142-3/+3
* | | | Merge branch 'instrument-ability' into 'master'Yorick Peterse2017-07-141-0/+4
|\ \ \ \
| * | | | Instrument Abilityinstrument-abilitySean McGivern2017-07-141-0/+4
* | | | | Merge branch 'gitlab-git-repository-log' into 'master'Sean McGivern2017-07-147-87/+113
|\ \ \ \ \
| * | | | | Indirectly migrate count_commits_between to GitalyJacob Vosmaer2017-07-131-1/+1
| * | | | | More Gitaly annotationsJacob Vosmaer2017-07-135-0/+22
| * | | | | Change Git::Repository#log to return CommitsJacob Vosmaer2017-07-133-86/+90
* | | | | | Merge branch 'bvl-shared-views-for-protected-refs' into 'master'Sean McGivern2017-07-1423-213/+258
|\ \ \ \ \ \
| * | | | | | Use shared protected tag views for CE-partialsbvl-shared-views-for-protected-refsBob Van Landuyt2017-07-1411-103/+122
| * | | | | | Use shared protected branches views for CE-partialsBob Van Landuyt2017-07-1412-110/+136
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'find-file-no-longer-inline' into 'master'Filipa Lacerda2017-07-145-12/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | missed one...find-file-no-longer-inlinePhil Hughes2017-07-131-5/+0
| * | | | | Move find file URL out of global variablePhil Hughes2017-07-134-7/+10
* | | | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-1440-86/+247
|\ \ \ \ \ \
| * | | | | | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-1340-86/+247
* | | | | | | Merge branch '35035-sidebar-job-spaces' into 'master'Phil Hughes2017-07-143-4/+12
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix spacing in sidebarFilipa Lacerda2017-07-143-4/+12
|/ / / / / /
* | | | | | Merge branch 'patch-16' into 'master'Achilleas Pipinellis2017-07-141-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed typokamesh2017-07-141-1/+1
* | | | | | | Merge branch 'sh-fix-nil-broadcast-message' into 'master'Sean McGivern2017-07-143-2/+13
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Handle nil BroadcastMessage.current in the viewsStan Hu2017-07-131-1/+1
| * | | | | | Handle case when BroadcastMessage.current is nilStan Hu2017-07-132-1/+12
|/ / / / / /
* | | | | | Merge branch 'dm-merge-request-creation-error' into 'master'Stan Hu2017-07-142-7/+32
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Make sure MergeRequest commit methods work when either compare_commits or mer...dm-merge-request-creation-errorDouwe Maan2017-07-132-7/+32
* | | | | | Merge branch 'artifacts-download-dropdown-menu-is-too-narrow' into 'master'Clement Ho2017-07-132-1/+6
|\ \ \ \ \ \
| * | | | | | Increase width of dropdown menus automatically up to 500 pxThomas Wucher2017-07-132-1/+6
* | | | | | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' into 'm...Douwe Maan2017-07-132-46/+928
|\ \ \ \ \ \ \
| * | | | | | | remove repeat the context of msgstr黄涛2017-07-051-140/+140
| * | | | | | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' of gitl...黄涛2017-06-290-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Repair the wrong deletion of the author黄涛2017-06-281-0/+2
| | * | | | | | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' of gitl...黄涛2017-06-280-0/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Delete JSON files generated from PO files黄涛2017-06-281-1/+0
| | | * | | | | | | rebase to master黄涛2017-06-280-0/+0
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | revise changelog黄涛2017-06-141-1/+1
| | | | * | | | | | | add changelog of supplement portuguese brazil translation黄涛2017-06-141-0/+4
| | | | * | | | | | | supplement portuguese brazil translation黄涛2017-06-142-69/+946
| | | * | | | | | | | supplement portuguese brazil translation黄涛2017-06-283-64/+947
| | | |/ / / / / / /
| | * | | | | | | | supplement portuguese brazil translation黄涛2017-06-282-64/+944
| * | | | | | | | | Repair the wrong deletion of the author黄涛2017-06-291-0/+2