summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Modify/add some forgotten issues API documentationtc-api-root-merge-requestsToon Claes2017-07-282-20/+24
* Default /merge_request API endpoint to `scope=created-by-me`Toon Claes2017-07-283-8/+31
* Add top-level /merge_requests API endpointToon Claes2017-07-275-31/+244
* Merge branch 'ch-test-removal' into 'master'Jacob Schatz2017-07-271-1/+0
|\
| * Test remove potentially unused filech-test-removalClement Ho2017-07-261-1/+0
* | Merge branch 'update-server-terms-for-ha-docs' into 'master'Drew Blessing2017-07-271-9/+9
|\ \
| * | Update server terminolgy to differentiate HA setups from GeoChenjerai Katanda2017-07-271-9/+9
|/ /
* | Merge branch 'feature/migrate-repository-tags-to-gitaly' into 'master'Robert Speicher2017-07-276-31/+80
|\ \
| * | Migrate Repository#tags to Gitalyfeature/migrate-repository-tags-to-gitalyAhmad Sherif2017-07-276-31/+80
* | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-279-9/+81
|\ \ \
| * | | Encapsulate the commit.sha logicHiroyuki Sato2017-07-273-6/+32
| * | | Use simplified routeHiroyuki Sato2017-07-271-1/+1
| * | | Remove unnecessary codeHiroyuki Sato2017-07-261-1/+0
| * | | Update changelog appropriatelyHiroyuki Sato2017-07-261-1/+1
| * | | Fix error of spinach testHiroyuki Sato2017-07-231-1/+1
| * | | Refactor: use keyword arguments for optional parametersHiroyuki Sato2017-07-233-4/+4
| * | | Change double quotes to single quotesHiroyuki Sato2017-07-231-7/+7
| * | | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-236307-80247/+297186
| |\ \ \
| * | | | Refactor specHiroyuki Sato2017-03-091-2/+2
| * | | | Prevent concurrent editing wikiHiroyuki Sato2017-03-088-8/+54
* | | | | Merge branch 'docs-new-topic-user-profile' into 'master'Job van der Voort2017-07-275-14/+55
|\ \ \ \ \
| * | | | | Docs new topic: "user/profile/index"Marcia Ramos2017-07-275-14/+55
|/ / / / /
* | | | | Merge branch 'docs-new-topic-user-project-repo-index' into 'master'Job van der Voort2017-07-278-6/+240
|\ \ \ \ \
| * | | | | Docs new topic "user/project/repository/index.md"Marcia Ramos2017-07-278-6/+240
|/ / / / /
* | | | | Merge branch 'remove_blob_by_oid' into 'master'Robert Speicher2017-07-271-4/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Removed `Repository#blob_by_oid` unused methodremove_blob_by_oidAndrew Newdigate2017-07-261-4/+0
| | |_|/ | |/| |
* | | | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-2712-8/+57
|\ \ \ \
| * | | | Use params#require instead params[] accessOswaldo Ferreira2017-07-271-1/+1
| * | | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-2712-8/+57
* | | | | Merge branch 'remove_custom_devise_failure_app' into 'master'Robert Speicher2017-07-272-29/+6
|\ \ \ \ \
| * | | | | Remove GitLab custom fealure app for deviseValery Sizov2017-07-272-29/+6
* | | | | | Merge branch 'harish-update-backup-restore-docs' into 'master'Achilleas Pipinellis2017-07-271-7/+7
|\ \ \ \ \ \
| * | | | | | Docs: Specify that backup restoration must be of the same typeHarish Ramachandran2017-07-041-7/+7
* | | | | | | Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'Robert Speicher2017-07-274-3/+11
|\ \ \ \ \ \ \
| * | | | | | | Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_errorPawel Chojnacki2017-07-274-3/+11
* | | | | | | | Merge branch '35577-fix-image-blob-display-due-to-lazy-image-loading' into 'm...Sean McGivern2017-07-273-10/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed Images in Blob Viewer to image_tag35577-fix-image-blob-display-due-to-lazy-image-loadingTim Zallmann2017-07-273-10/+11
| * | | | | | | | Added lazy class to Blob Images + DiffsTim Zallmann2017-07-272-8/+8
* | | | | | | | | Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets2017-07-2778-39/+2077
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | add "GPG Keys" to new navigationAlexis Reigel2017-07-271-0/+4
| * | | | | | | | remove log statements from workersAlexis Reigel2017-07-274-30/+3
| * | | | | | | | improve gpg key validationAlexis Reigel2017-07-272-3/+12
| * | | | | | | | optimize query, only select relevant db columnsAlexis Reigel2017-07-272-11/+54
| * | | | | | | | add unique index for gpg_signatures#commit_shaAlexis Reigel2017-07-272-2/+2
| * | | | | | | | validate the foreign_key instead of the relationAlexis Reigel2017-07-272-2/+2
| * | | | | | | | update all records at once using `update_all`Alexis Reigel2017-07-271-6/+5
| * | | | | | | | simplify nil handlingAlexis Reigel2017-07-272-2/+5
| * | | | | | | | add unique indexes to gpg_keysAlexis Reigel2017-07-272-2/+4
| * | | | | | | | use Module#prepend instead of alias_method_chainAlexis Reigel2017-07-271-16/+12
| * | | | | | | | extract setter as before_actionAlexis Reigel2017-07-271-4/+8
View Lorry Controller Status