summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Many Repo FixesJacob Schatz2017-08-151-0/+5
* Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-111-12/+0
|\
| * Remove unused `redirect_to_external_issue_tracker` methodMehdi Lahmam2017-08-101-12/+0
* | Avoid ambiguity, which happened in a single test runLin Jen-Shin2017-08-101-1/+1
|/
* Merge branch 'master' into ideMike Greiling2017-08-071-5/+0
|\
| * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-5/+0
* | Fix ABC size of BlobController#showLuke "Jared" Bennett2017-08-041-24/+32
* | Add render_error to blob JSONDouwe Maan2017-08-031-1/+2
* | Clean up some backendDouwe Maan2017-08-031-6/+20
* | Merge branch 'master' into ideDouwe Maan2017-08-032-18/+3
|\ \ | |/
| * Fix Issue board when using Ruby 2.435769-fix-ruby-2-4-compatibilityRémy Coutable2017-08-011-1/+2
| * Add option to use CommitLanguages RPCJacob Vosmaer2017-08-011-17/+1
* | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-311-1/+1
|\ \ | |/
| * Merge branch '26890-sort-branches' into 'master'Rémy Coutable2017-07-281-1/+1
| |\
| | * WIP: This makes the default sort order for branches 'recently updated' rather...26890-sort-branchesMatt Lee2017-01-201-1/+1
* | | Add environment instance var to BlobController#show html respLuke "Jared" Bennett2017-07-311-0/+3
* | | render blob/show if not show_new_repo?Luke "Jared" Bennett2017-07-281-1/+2
* | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-287-20/+49
|\ \ \ | |/ /
| * | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-1/+4
| |\ \
| | * \ Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-2370-1545/+1860
| | |\ \
| | * | | Prevent concurrent editing wikiHiroyuki Sato2017-03-081-1/+4
| * | | | fetch gpg signature badges by ajaxAlexis Reigel2017-07-271-10/+30
| * | | | Resolve "Memory usage notice doesn't link anywhere"Tim Zallmann2017-07-261-0/+6
| * | | | Merge branch 'backport-ee-2328' into 'master'Sean McGivern2017-07-251-0/+1
| |\ \ \ \
| | * | | | Backport changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/...Nick Thomas2017-07-211-0/+1
| * | | | | Support both internal and external issue trackersJarka Kadlecova2017-07-241-4/+0
| * | | | | Associate Issues tab only with internal issues trackerJarka Kadlecova2017-07-241-5/+8
| | |_|/ / | |/| | |
| * | | | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-212-4/+4
| |/ / /
* | | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2048-601/+674
|\ \ \ \ | |/ / /
| * | | Wrong data type when testing webhooksAlexander Randa2017-07-202-8/+8
| * | | Fix external issue trackers redirectissue_35132Felipe Artur2017-07-181-1/+1
| * | | Update Pipeline's badge count in Merge Request and Commits view to match real...Filipa Lacerda2017-07-142-6/+16
| * | | Merge branch 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes'...Grzegorz Bizon2017-07-141-2/+1
| |\ \ \
| | * | | Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedulefix/sm/32032-remove-the-rest-of-trigger_schedule-related-codesShinya Maeda2017-07-131-2/+1
| * | | | Revert "Merge branch 'revert-2c879643' into 'master'"Sean McGivern2017-07-141-1/+1
| * | | | Make sure MergeRequest commit methods work when either compare_commits or mer...dm-merge-request-creation-errorDouwe Maan2017-07-131-1/+1
| |/ / /
| * | | Merge branch '30281-report-abusive-content-from-an-issue-or-merge-request' in...Jacob Schatz2017-07-071-2/+1
| |\ \ \
| | * | | Revert parent param removalLuke "Jared" Bennett2017-07-072-2/+2
| | * | | Removed merge_request/issue state_event param parent and removed issuable_pat...Luke "Jared" Bennett2017-07-072-3/+2
| * | | | Merge branch 'feature/intermediate/32568-adding-variables-to-pipelines-schedu...Kamil Trzciński2017-07-071-5/+14
| |\ \ \ \
| | * \ \ \ Merge from master(Fix conflicts)Shinya Maeda2017-07-072-17/+27
| | |\ \ \ \ | | | |/ / /
| | * | | | Remove update|admin_pipeline_schedule from Project, and grant it in PipelineS...Kamil Trzcinski2017-07-071-0/+4
| | * | | | merge from masterShinya Maeda2017-07-0741-134/+138
| | |\ \ \ \
| | * | | | | Revert "Implement Ci::NestedUniquenessValidator"Shinya Maeda2017-07-061-2/+1
| | * | | | | Implement Ci::NestedUniquenessValidatorShinya Maeda2017-07-051-1/+2
| | * | | | | zj nice catchies 3Shinya Maeda2017-07-051-1/+1
| | * | | | | zh nich catches 2Shinya Maeda2017-07-051-2/+2
| | * | | | | Revert extra validation for duplication between same keys on a submitShinya Maeda2017-07-051-2/+1
| | * | | | | Define authorize_update_pipeline_schedule and apply to :edit, :take_ownership...Shinya Maeda2017-07-051-4/+6
| | * | | | | Add functionality and security.Shinya Maeda2017-07-051-0/+2
View Lorry Controller Status