summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add AD matching rule filter and more informationad_matching_rule_docDrew Blessing2017-07-141-1/+6
|
* Merge branch 'backport-ee-mysql2-version' into 'master'Sean McGivern2017-07-142-3/+3
|\ | | | | | | | | Update the mysql2 gem to v0.4.5 See merge request !12859
| * 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 Ability See merge request !12865
| * | Instrument Abilityinstrument-abilitySean McGivern2017-07-141-0/+4
| | |
* | | Merge branch 'gitlab-git-repository-log' into 'master'Sean McGivern2017-07-147-87/+113
|\ \ \ | | | | | | | | | | | | | | | | Gitlab::Git shuffling and Gitaly annotations See merge request !12849
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Extract partials from the protected_branches & protected_tags views See merge request !12864
| * | | | Use shared protected tag views for CE-partialsbvl-shared-views-for-protected-refsBob Van Landuyt2017-07-1411-103/+122
| | | | | | | | | | | | | | | | | | | | So they are reusable for EE later
| * | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Move find file URL out of global variable See merge request !12846
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Part of #34903
* | | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-1440-86/+247
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491
| * | | | | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-1340-86/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController
* | | | | | Merge branch '35035-sidebar-job-spaces' into 'master'Phil Hughes2017-07-143-4/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing in sidebar Closes #35035 See merge request !12844
| * | | | | Fix spacing in sidebarFilipa Lacerda2017-07-143-4/+12
|/ / / / /
* | | | | Merge branch 'patch-16' into 'master'Achilleas Pipinellis2017-07-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed typo See merge request !12862
| * | | | | Fixed typokamesh2017-07-141-1/+1
| | | | | |
* | | | | | Merge branch 'sh-fix-nil-broadcast-message' into 'master'Sean McGivern2017-07-143-2/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle case when BroadcastMessage.current is nil Closes #35094 See merge request !12860
| * | | | | Handle nil BroadcastMessage.current in the viewsStan Hu2017-07-131-1/+1
| | | | | |
| * | | | | Handle case when BroadcastMessage.current is nilStan Hu2017-07-132-1/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow Rails.cache.fetch occasionally returns `nil` values, which causes this endpoint to crash. Closes #35094
* | | | | 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 merge_request_diff is set Closes #35077 See merge request !12856
| * | | | Make sure MergeRequest commit methods work when either compare_commits or ↵dm-merge-request-creation-errorDouwe Maan2017-07-132-7/+32
| | | | | | | | | | | | | | | | | | | | merge_request_diff is set
* | | | | Merge branch 'artifacts-download-dropdown-menu-is-too-narrow' into 'master'Clement Ho2017-07-132-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase width of dropdown menus Closes #34989 See merge request !12809
| * | | | | 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 ↵Douwe Maan2017-07-132-46/+928
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Supplement Portuguese Brazil translation of Project Page & Repository Page Closes #33672 See merge request !12156
| * | | | | | remove repeat the context of msgstr黄涛2017-07-051-140/+140
| | | | | | |
| * | | | | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' of ↵黄涛2017-06-290-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:htve/gitlab-ce into 33672_supplement_portuguese_brazil_translation_of_i18n
| | * | | | | | Repair the wrong deletion of the author黄涛2017-06-281-0/+2
| | | | | | | |
| | * | | | | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' of ↵黄涛2017-06-280-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:htve/gitlab-ce into 33672_supplement_portuguese_brazil_translation_of_i18n
| | | * | | | | | Delete JSON files generated from PO files黄涛2017-06-281-1/+0
| | | | | | | | |
| | | * | | | | | rebase to master黄涛2017-06-280-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '33672_supplement_portuguese_brazil_translation_of_i18n' of gitlab.com:htve/gitlab-ce into 33672_supplement_portuguese_brazil_translation_of_i18n
| | | | * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33672
| | | * | | | | | | supplement portuguese brazil translation黄涛2017-06-283-64/+947
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33672
| | * | | | | | | supplement portuguese brazil translation黄涛2017-06-282-64/+944
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33672
| * | | | | | | | Repair the wrong deletion of the author黄涛2017-06-291-0/+2
| | | | | | | | |
| * | | | | | | | supplement portuguese brazil translation黄涛2017-06-291-84/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33672
| * | | | | | | | revise changelog黄涛2017-06-291-1/+1
| | | | | | | | |
| * | | | | | | | add changelog of supplement portuguese brazil translation黄涛2017-06-291-0/+4
| | | | | | | | |
| * | | | | | | | supplement portuguese brazil translation黄涛2017-06-291-68/+945
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33672
* | | | | | | | | Merge branch 'reload-new-navigation-option-change' into 'master'Filipa Lacerda2017-07-131-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reload page after changing navigation preference Closes #34968 See merge request !12833
| * | | | | | | | | Reload page after changing navigation preferencereload-new-navigation-option-changePhil Hughes2017-07-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34968
* | | | | | | | | | Merge branch 'note-on-mysql-for-db-seed' into 'master'Rémy Coutable2017-07-131-0/+50
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more notes about developer seeds See merge request !12836
| * | | | | | | | | | Add more notes about developer seedsLin Jen-Shin (godfat)2017-07-131-0/+50
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'backport-mr-create-service-changes' into 'master'Grzegorz Bizon2017-07-131-2/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport MR create service changes from EE See merge request !12808
View Lorry Controller Status