summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into filter-branch-by-nametiagonbotelho2016-07-229-71/+83
|\
| * Merge branch 'discussion-model' into 'master' Robert Speicher2016-07-214-36/+43
| |\
| | * Add Discussion model to represent MR/diff discussiondiscussion-modelDouwe Maan2016-07-204-36/+43
| * | Merge branch '4142-show-inline-video' into 'master' Rémy Coutable2016-07-211-4/+4
| |\ \ | | |/ | |/|
| | * First support of videos in issues, MRs and notesEric Hayes2016-07-191-4/+4
| * | Merge branch 'cs-warn-on-failure' into 'master' Fatih Acet2016-07-201-0/+2
| |\ \
| | * | Address feedback.Connor Shea2016-07-191-1/+1
| | * | Add with_warnings? method to Pipelines and add tests.Connor Shea2016-07-191-0/+2
| | |/
| * | Merge branch 'issue_8110' into 'master' Rémy Coutable2016-07-201-25/+2
| |\ \
| | * | Refactor service settings viewissue_8110Felipe Artur2016-07-201-14/+1
| | * | Add project service documentation and update integration documentationFelipe Artur2016-07-191-16/+1
| | * | Allow slack service to send messages on different channelsFelipe Artur2016-07-191-1/+6
| | |/
| * | Merge branch 'compare-code-view' into 'master' Jacob Schatz2016-07-201-0/+1
| |\ \
| | * | Apply diff view cookie on comparecompare-code-viewPhil Hughes2016-07-151-0/+1
| * | | Change how we style redirect_toKamil Trzcinski2016-07-201-3/+1
| * | | Use flash[:notice] onlyKamil Trzcinski2016-07-201-2/+1
| * | | Create PipelinesSettingsController for showing settings pageKamil Trzcinski2016-07-203-27/+35
| * | | Fix updating settings for pipelines15343-build-settiingsKamil Trzcinski2016-07-201-14/+8
| * | | Merge remote-tracking branch 'origin/master' into 15343-build-settiingsKamil Trzcinski2016-07-202-4/+15
| |\ \ \ | | | |/ | | |/|
| * | | Move Pipelines settings under `gitlab.com/gitlab-org/gitlab-ce/pipelines/sett...Kamil Trzcinski2016-07-193-8/+34
| * | | Update badges pathAnnabel Dunstone2016-07-191-1/+1
| * | | Remove unused badges page and delete badges index controller actionAnnabel Dunstone2016-07-191-5/+0
| * | | Remove builds settings from project settings; add builds settings route; add ...Annabel Dunstone2016-07-191-1/+6
* | | | implements the basic filter functionalitytiagonbotelho2016-07-191-2/+1
| |/ / |/| |
* | | Merge branch 'rename-repo-files' into 'master' Douwe Maan2016-07-191-0/+6
|\ \ \
| * \ \ Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-193-2/+4
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into rename-repo-filestiagonbotelho2016-07-182-2/+4
| |\ \ \
| * | | | renames :file_name to :file_pathtiagonbotelho2016-07-131-2/+2
| * | | | test for nil params :file_nametiagonbotelho2016-07-121-1/+1
| * | | | refactors update action to change commit_params with the correct pathtiagonbotelho2016-07-121-4/+5
| * | | | changes the usasge of path to file_path on blob_controller for compatibillity...tiagonbotelho2016-07-121-4/+4
| * | | | fixes merge request edit bug where it would generate a cloned file and not re...tiagonbotelho2016-07-121-5/+0
| * | | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-0/+1
| * | | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+0
| * | | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-121-0/+1
| * | | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-1/+0
| * | | | remove prints and useless commentstiagonbotelho2016-07-121-0/+1
| * | | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-121-1/+0
| * | | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-0/+1
| * | | | fixes merge request edit bug where it would generate a cloned file and not re...tiagonbotelho2016-07-121-0/+5
| * | | | refactors blob_controllertiagonbotelho2016-07-121-1/+1
| * | | | creates the update_file method in repository.rb and applies changes accordinglytiagonbotelho2016-07-121-1/+1
| * | | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-1/+0
| * | | | remove prints and useless commentstiagonbotelho2016-07-121-1/+1
| * | | | successfully adds the new version with the updated name on the projects repotiagonbotelho2016-07-121-1/+5
| * | | | implements the form for renaming the new filename on the file edit pagetiagonbotelho2016-07-121-1/+2
* | | | | Merge branch 'manual-actions' into 'master' Rémy Coutable2016-07-191-4/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Improve code designKamil Trzcinski2016-07-181-6/+2
| * | | | Improve manual actions code and add model, service and feature testsKamil Trzcinski2016-07-181-1/+1
| * | | | Add implementation of manual actionsKamil Trzcinski2016-07-181-0/+9
| | |/ / | |/| |
View Lorry Controller Status