summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'i-#25814-500-error' into 'master' Sean McGivern2017-01-181-1/+10
|\
| * refactor rubocop suggestionMartin Cabrera2017-01-161-1/+1
| * Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-161-7/+4
| |\
| * | Refactored ‘from’ and ‘to’ variable preservationMartin Cabrera2017-01-161-10/+6
| * | from or to get variables gets preserved if the other one is missingMartin Cabrera2017-01-151-2/+9
| * | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-153-25/+66
| |\ \
| * | | Changed alert message character: from & to and Martin Cabrera2017-01-151-1/+2
| * | | Merge branch 'master' into i-#25814-500-errorMartin Cabrera2017-01-123-56/+92
| |\ \ \
| * | | | Fix Compare page throws 500 error when any branch/reference is not selectedMartin Cabrera2017-01-101-1/+6
* | | | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-172-1/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Address MR commentsJarka Kadlecova2017-01-131-1/+1
| * | | | refresh merge widget after using /merge commandJarka Kadlecova2017-01-111-0/+10
| * | | | support `/merge` slash comand for MRsJarka Kadlecova2017-01-111-1/+2
| |/ / /
* | | | Add a spec and actually display the flash noticeRémy Coutable2017-01-161-7/+4
* | | | Fix to display notice when project settings updated.sandish chen2017-01-151-2/+2
| |_|/ |/| |
* | | Merge branch 'refactor-controller-params' into 'master' Robert Speicher2017-01-122-21/+66
|\ \ \
| * | | Refactor authorized params in GroupsControllerRémy Coutable2017-01-121-2/+6
| * | | Refactor allowed params in ServiceParamsRémy Coutable2017-01-121-19/+60
| | |/ | |/|
* | | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-121-4/+0
|/ /
* | Add support for PlantUML diagrams in Asciidoc.Horacio Sanson2017-01-121-0/+2
* | Refactor authorized params in Admin::UsersControllerrefactor-admin-controllers-paramsRémy Coutable2017-01-112-27/+32
* | Refactor authorized params in Admin::GroupsControllerRémy Coutable2017-01-111-2/+6
* | Refactor authorized params in Admin::ApplicationSettingsControllerRémy Coutable2017-01-111-45/+70
|/
* Merge branch 'master' into auto-pipelines-vueRegis2017-01-096-76/+84
|\
| * Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-063-52/+64
| |\
| | * Updated the "users" to "members" matches in the viewJose Ivan Vargas2017-01-031-3/+3
| | * Removed the "Groups" option from the settings gearJose Ivan Vargas2017-01-031-2/+2
| | * Added groups to members section, added a members finderJose Ivan Vargas2017-01-032-10/+10
| | * Fixed more rspec tests as well as spinach featuresJose Ivan Vargas2017-01-031-1/+2
| | * Fixed rspec tests for the project members also fixed the indexJose Ivan Vargas2017-01-031-42/+1
| | * Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-032-4/+56
| * | Speed up group milestone index by passing group_id to IssuesFinderAdam Niedzielski2017-01-063-24/+20
* | | Include resources to speed up pipelines serializerGrzegorz Bizon2017-01-051-1/+0
* | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-043-11/+12
|\ \ \ | |/ /
| * | Merge branch 'recaptcha_500' into 'master' Rémy Coutable2017-01-041-8/+8
| |\ \
| | * | Properly handle failed reCAPTCHA on user registrationDrew Blessing2017-01-031-8/+8
| * | | Merge branch 'add_email_password_confirmation' into 'master' Douwe Maan2017-01-041-1/+1
| |\ \ \
| | * | | Add email and password confirmation fields to registration formDrew Blessing2017-01-031-1/+1
| * | | | Merge branch '25836-changing-from-version-in-diff-comparison-does-not-preserv...Fatih Acet2017-01-031-1/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-versionSam Rose2016-12-311-1/+2
| | | |/ | | |/|
| * | | Rename logo, apply for Slack tooZ.J. van de Weg2017-01-031-1/+1
| * | | Add logo in public filesZ.J. van de Weg2017-01-031-1/+1
| * | | Use stable icon for Mattermost integrationKamil Trzcinski2017-01-031-1/+1
| |/ /
* | | fix pipelines/index.html.haml merge conflictRegis2017-01-0212-14/+26
|\ \ \ | |/ /
| * | Merge branch 'issue_25578' into 'master' Sean McGivern2016-12-301-1/+1
| |\ \
| | * | Fix redirect after update file when user has forked projectFelipe Artur2016-12-291-1/+1
| * | | Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-3/+0
| |/ /
| * | Merge branch 'dz-nested-group-misc' into 'master' Dmitriy Zaporozhets2016-12-291-0/+2
| |\ \
| | * | Show nested groups tab on group pageDmitriy Zaporozhets2016-12-261-0/+2
| * | | Merge branch '25925-fix-tag-sorting-and-filtering-options' into 'master' Annabel Dunstone Gray2016-12-291-1/+1
| |\ \ \
View Lorry Controller Status