summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* More improvements to presenters23563-document-presentersRémy Coutable2017-01-181-1/+1
* Add Presentable concernRémy Coutable2017-01-181-1/+1
* Merge branch 'i-#25814-500-error' into 'master' Sean McGivern2017-01-181-1/+10
|\
| * refactor rubocop suggestionMartin Cabrera2017-01-161-1/+1
| * 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-151-4/+0
| |\
| * | Changed alert message character: from & to and Martin Cabrera2017-01-151-1/+2
| * | 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
| |/
* | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security'Robert Speicher2017-01-121-4/+0
|/
* Merge branch 'master' into auto-pipelines-vueRegis2017-01-093-52/+64
|\
| * 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
* | | Include resources to speed up pipelines serializerGrzegorz Bizon2017-01-051-1/+0
* | | Merge branch 'master' into auto-pipelines-vueRegis2017-01-042-2/+3
|\ \ \ | |/ /
| * | 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-025-3/+12
|\ \ | |/
| * Merge branch '25925-fix-tag-sorting-and-filtering-options' into 'master' Annabel Dunstone Gray2016-12-291-1/+1
| |\
| | * Set default sort for tags to Last updated25925-fix-tag-sorting-and-filtering-optionsSam Rose2016-12-281-1/+1
| * | Merge branch '19988-prevent-empty-pagination-when-list-not-empty' into 'master' Douwe Maan2016-12-283-0/+9
| |\ \ | | |/ | |/|
| | * applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-emptyTiago Botelho2016-12-232-2/+2
| | * adds specs for respective behaviourTiago Botelho2016-12-213-6/+12
| | * Prevent empty pagination when list is not emptyTiago Botelho2016-12-213-3/+6
| * | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-271-2/+2
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-207-11/+101
| | |\
| | * \ Merge CSSFilipa Lacerda2016-12-127-21/+51
| | |\ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0615-70/+74
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-229-48/+127
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-175-9/+12
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-1032-256/+940
| | |\ \ \ \ \ \
| | * | | | | | | Set current user as deploy key userAli Ibrahim2016-09-031-1/+1
| | * | | | | | | Allow to add deploy keys with write-accessAli Ibrahim2016-08-171-1/+1
* | | | | | | | | merge master and fix application.rb conflictRegis2016-12-233-43/+48
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch '23638-remove-builds-tab' into 'master' Kamil Trzciński2016-12-212-43/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Changes after reviewFilipa Lacerda2016-12-211-1/+1
| | * | | | | | | | Remove builds tab from commitFilipa Lacerda2016-12-212-40/+2
| | * | | | | | | | Removes builds tab from merge requestFilipa Lacerda2016-12-211-2/+2
View Lorry Controller Status