summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Avoid unnecessary usage of local varsshow-diff-stats-for-mrDmitriy Zaporozhets2015-10-012-6/+3
* Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-012-19/+20
* Merge branch 'mr_improve_errors_handling'Dmitriy Zaporozhets2015-10-013-5/+11
|\
| * Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-013-5/+11
* | Merge branch 'include-full-path-in-new-mr-page' into 'master' Dmitriy Zaporozhets2015-10-012-2/+16
|\ \
| * | Include full path of source and target branch names in New Merge Request pageStan Hu2015-09-302-2/+16
| |/
* | Merge branch 'project_moving' into 'master' Dmitriy Zaporozhets2015-10-017-10/+13
|\ \
| * | Note the original location of a moved project when notifying users of the moveproject_movingValery Sizov2015-10-017-10/+13
| |/
* | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-resetRobert Speicher2015-09-301-21/+0
|/
* Merge branch 'fix-view-admin-applications-text' into 'master' Robert Speicher2015-09-301-1/+1
|\
| * Adds newline at end of fileDiogo Resende2015-09-301-1/+1
| * Adds missing plural form of applications of previous commitDiogo Resende2015-09-301-1/+1
| * Fixes english information paragraph in admin/applications viewDiogo Resende2015-09-301-2/+2
* | Merge branch 'merge-ci-data' into 'master' Dmitriy Zaporozhets2015-09-303-28/+23
|\ \
| * | Delegate ci_project parameters to projectsKamil Trzcinski2015-09-303-28/+23
* | | Merge branch 'fix-removed-file-in-diff' into 'master' Dmitriy Zaporozhets2015-09-303-15/+33
|\ \ \
| * | | Fix bug when removed file was not appearing in merge request diffDmitriy Zaporozhets2015-09-303-15/+33
| |/ /
* | | Merge branch 'cleanup-ci-helpers' into 'master' Dmitriy Zaporozhets2015-09-3012-142/+92
|\ \ \ | |/ / |/| |
| * | Fix CI mailercleanup-ci-helpersDmitriy Zaporozhets2015-09-301-1/+0
| * | Refactor CI helpersDmitriy Zaporozhets2015-09-2911-141/+92
* | | Merge branch 'move-ci-settings' into 'master' Dmitriy Zaporozhets2015-09-308-53/+62
|\ \ \ | |/ / | | / | |/ |/|
| * Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-298-53/+62
* | Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master' Dmitriy Zaporozhets2015-09-291-1/+1
|\ \ | |/ |/|
| * Link directly to the projects page instead of the root controllerStan Hu2015-09-281-1/+1
* | Merge branch 'ci-commits-to-projects' into 'master' Dmitriy Zaporozhets2015-09-297-34/+58
|\ \
| * | Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projectsKamil Trzcinski2015-09-292-9/+3
| * | Rename commits to ci_commitsKamil Trzcinski2015-09-292-4/+10
| * | Fix rubocopKamil Trzcinski2015-09-291-2/+2
| * | Fix testsKamil Trzcinski2015-09-293-5/+4
| * | Fix register_build_service testsKamil Trzcinski2015-09-292-3/+7
| * | Revert check_enable_flag! changesKamil Trzcinski2015-09-291-4/+4
| * | Fix testsKamil Trzcinski2015-09-293-11/+24
| * | WIPKamil Trzcinski2015-09-295-24/+27
| * | WIPKamil Trzcinski2015-09-294-6/+11
* | | Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-296-54/+46
|/ /
* | Merge branch 'projects' into 'master' Dmitriy Zaporozhets2015-09-292-1/+8
|\ \
| * | page-title-fixAndrey2015-09-282-1/+8
* | | Merge branch 'move-variables-page' into 'master' Dmitriy Zaporozhets2015-09-297-47/+39
|\ \ \
| * | | Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-287-47/+39
| | |/ | |/|
* | | Merge branch 'krb_auth_helper_ce' into 'master' Douwe Maan2015-09-291-1/+1
|\ \ \ | |/ / |/| |
| * | Remove 'kerberos' from auth_helper.rb for gitlab-CE.Ben Rosser2015-09-241-1/+1
* | | Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-2816-100/+107
|\ \ \
| * | | Finish move of runners page to project settingsDmitriy Zaporozhets2015-09-282-2/+2
| * | | Move runners page to project settingsDmitriy Zaporozhets2015-09-2513-97/+104
| * | | Fix admin runner page -> assign all buttonDmitriy Zaporozhets2015-09-251-1/+1
* | | | Merge branch 'cyrillic-font' into 'master' Dmitriy Zaporozhets2015-09-284-0/+0
|\ \ \ \
| * | | | Update Source Sans Pro font: adds support for cyrillic characterscyrillic-fontDmitriy Zaporozhets2015-09-284-0/+0
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDouwe Maan2015-09-2821-117/+443
|\ \ \ \ \
| * \ \ \ \ Merge branch 'projects'Dmitriy Zaporozhets2015-09-2821-117/+443
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | !important removed from preAndrey2015-09-283-10/+5
View Lorry Controller Status