summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-issue-4032' into 'master' Douwe Maan2015-12-151-1/+2
|\
| * Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
* | Use a new admin runners path when reseting runners tokenGrzegorz Bizon2015-12-141-1/+1
* | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1430-424/+185
|\ \
| * \ Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-1425-325/+179
| |\ \
| | * | Fix after column renameKamil Trzcinski2015-12-111-1/+1
| | * | Fix errorsKamil Trzcinski2015-12-111-3/+0
| | * | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-116-14/+14
| | * | Add runners tokenKamil Trzcinski2015-12-112-8/+1
| | * | Migrate CI::Project to ProjectKamil Trzcinski2015-12-1124-315/+179
| * | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-144-96/+5
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-104-96/+5
| * | Implement new sidebar for merge request pageDmitriy Zaporozhets2015-12-112-3/+0
| * | display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statusesGreg Smethells2015-12-111-0/+1
| |/
* | Add CI runners registration token reset buttonGrzegorz Bizon2015-12-111-0/+6
|/
* Use devise paranoid mode and ensure the same message is returned every timeDrew Blessing2015-12-091-2/+4
* Give merge request widget the vars it desiresDouwe Maan2015-12-091-0/+5
* Merge branch 'master' into merge-if-greenDouwe Maan2015-12-095-20/+43
|\
| * Fix only 20 group members showing on project member pageDmitriy Zaporozhets2015-12-091-1/+1
| * Merge branch 'mr-builds' into 'master' Dmitriy Zaporozhets2015-12-092-16/+31
| |\
| | * Merge branch 'master' into mr-buildsDouwe Maan2015-12-083-9/+56
| | |\
| | * | Add Builds tab to MR detail pageDouwe Maan2015-12-081-12/+29
| | * | Move commit builds to partialDouwe Maan2015-12-081-4/+4
| * | | Merge branch 'edit-in-patch-branch' into 'master' Robert Speicher2015-12-082-3/+11
| |\ \ \ | | |_|/ | |/| |
| | * | Make tooltip less confusingDouwe Maan2015-12-081-1/+1
| | * | Default target branch to patch-n when editing file in protected branchDouwe Maan2015-12-081-2/+10
* | | | Merge branch 'master' into merge-if-greenDouwe Maan2015-12-083-2/+24
|\ \ \ \ | |/ / /
| * | | Merge branch 'build-related-fixes' into 'master' Dmitriy Zaporozhets2015-12-083-2/+4
| |\ \ \
| | * | | Get ci_commit in MR controllerDouwe Maan2015-12-081-0/+2
| | * | | `builds_enabled` rather than `ci_enabled`Douwe Maan2015-12-082-2/+2
| | | |/ | | |/|
| * | | Merge branch 'languages-graph' into 'master' Robert Speicher2015-12-081-0/+20
| |\ \ \ | | |_|/ | |/| |
| | * | Implement languages graph pageDmitriy Zaporozhets2015-12-081-0/+20
| | |/
* | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-081-7/+34
|\ \ \ | |/ /
| * | Merge branch 'serve_lfs_object' into 'master' Douwe Maan2015-12-081-7/+34
| |\ \ | | |/ | |/|
| | * Add specs for showing lfs object in UI.Marin Jankovski2015-12-071-7/+17
| | * Move the file serving to Raw controller, add a few ifs to view.Marin Jankovski2015-12-032-24/+24
| | * If a user clicks on the LFS object, it should be served if the user has acces...Marin Jankovski2015-12-031-0/+17
* | | Merge branch 'master' into zj/gitlab-ce-merge-if-greenDouwe Maan2015-12-084-14/+24
|\ \ \ | |/ /
| * | Merge branch 'report-ssl-errors' of https://gitlab.com/stanhu/gitlab-ceDmitriy Zaporozhets2015-12-071-3/+2
| |\ \
| | * | Handle and report SSL errors in Web hook test. Check for status 200 for success.Stan Hu2015-12-041-3/+2
| * | | Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'Douwe Maan2015-12-071-0/+2
| |\ \ \
| | * \ \ Merge branch 'master' into gsmethells/gitlab-ce-sort-by-due-dategsmethells/gitlab-ce-sort-by-due-dateDouwe Maan2015-12-073-2/+3
| | |\ \ \
| | * | | | sort milestones by due_dateGreg Smethells2015-12-031-0/+2
| | | |_|/ | | |/| |
| * | | | Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' Grzegorz Bizon2015-12-071-10/+19
| |\ \ \ \
| | * | | | Notify user when award-emoji comment is invalidGrzegorz Bizon2015-12-031-1/+6
| | * | | | Render json message with errors if note didn't pass validationGrzegorz Bizon2015-12-031-10/+14
| | |/ / /
| * | | | Merge branch 'fix-global-milestones-error-500' into 'master' Douwe Maan2015-12-071-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix Error 500 when creating global milestones with Unicode charactersStan Hu2015-12-051-1/+1
| | | |/ | | |/|
* | | | Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-0718-108/+190
|\ \ \ \ | |/ / /
| * | | Notify user if they cannot create projectsAndrew Tomaka2015-12-051-0/+1
| |/ /
View Lorry Controller Status