summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-077-163/+91
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup CI pages - [x] Remove `ci/projects/:id` page - [x] Remove Continuous integration from project menu - [x] Remove unused css/js - [x] Remove Ci::Commit and Ci::Build controllers - [x] Move CI services to project settings area cc @ayufan Part of #2594 See merge request !1529
| * Fix tests and few CI featuresDmitriy Zaporozhets2015-10-072-1/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move CI services to project settings areaDmitriy Zaporozhets2015-10-072-59/+49
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Remove Ci::Commit and Ci::Build controllerscleanup-ci-pagesDmitriy Zaporozhets2015-10-074-84/+38
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Remove Continuous Integration from project menuDmitriy Zaporozhets2015-10-071-20/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add directory feature buttonStan Hu2015-10-072-4/+41
|/ | | | | | | | | | | | | | | | | | Change "+" icon under "Files" section to have three options: * Create file * Upload file * New directory Upload file is no longer accessible from the "Create file" page. Users can now select a target branch in upload file as well. Closes #2799: Fixes a bug where file modes were overwritten after a commit Closes https://github.com/gitlabhq/gitlabhq/issues/8253: Existing files can no longer be overwritten in the "Create file" section. Closes #2557
* Fix ci build routing and few testsci-build-pageDmitriy Zaporozhets2015-10-061-2/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Refactor commit/build tests and fix CI cancelDmitriy Zaporozhets2015-10-061-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Cleanup CI code after refactoring and fix several 500 errorsDmitriy Zaporozhets2015-10-063-42/+6
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move CI build page to CE projectDmitriy Zaporozhets2015-10-061-0/+25
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'ci-commit-page' into 'master' Dmitriy Zaporozhets2015-10-061-0/+7
|\ | | | | | | | | | | | | | | | | Render CI statuses on commit page This MR merges CI commit page into CE commit page. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1519
| * Render CI statuses on commit pageDmitriy Zaporozhets2015-10-061-0/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix broken grouping sql clause when rendering commits for CIKamil Trzcinski2015-10-061-2/+3
|/
* Fix graphical glitchesKamil Trzcinski2015-10-051-3/+5
|
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-10-053-16/+2
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-053-16/+2
| |\ | | | | | | | | | See merge request !1512
| | * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-053-16/+2
| | | | | | | | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
* | | Merge branch 'user-preferences-layout-option' of ↵Dmitriy Zaporozhets2015-10-051-0/+1
|\ \ \ | |/ / |/| | | | | | | | | | | https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | added user preference to change layout widthPeter Göbel2015-10-051-0/+1
| |/
* | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-053-5/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build. All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository. All code related for creating builds is moved to CreateBuildsService. Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API. This is partially working, tests are not yet touched. This slightly changes view of Commit: ![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png) @dzaporozhets What do you think? See merge request !1502
| * Fix next round of testsKamil Trzcinski2015-10-051-1/+1
| |
| * Refactor commit and buildKamil Trzcinski2015-10-053-5/+6
| |
* | Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-052-53/+45
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-033-17/+28
|\
| * Merge remote-tracking branch 'public/hide_services_password'Dmitriy Zaporozhets2015-10-021-1/+3
| |\
| | * Hide password in the service settings formhide_services_passwordValery Sizov2015-10-021-1/+3
| | |
| * | Merge branch 'rs-throttle-reset' into 'master' Douwe Maan2015-10-021-16/+24
| |\ \ | | |/ | |/| | | | | | | | | | | | | Throttle "Forgot your password?" emails Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611 See merge request !1476
| | * Refactor PasswordsController to use before_actionsRobert Speicher2015-10-011-21/+21
| | |
| | * Only allow password reset emails once per minuteRobert Speicher2015-09-301-7/+15
| | | | | | | | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2611
| * | Add last push widget to starred projects dashboardDrew Blessing2015-10-011-0/+1
| | |
* | | Fix rubocop warnings in appGuilherme Garnier2015-10-033-4/+4
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDouwe Maan2015-10-013-22/+5
|\ \
| * \ Merge branch 'mr_improve_errors_handling'Dmitriy Zaporozhets2015-10-011-0/+1
| |\ \ | | |/ | |/|
| | * Improve error message when merging failsmr_improve_errors_handlingValery Sizov2015-10-011-0/+1
| | |
| * | Take advantage of `Devise.sign_in_after_reset_password`rs-disable-signin-after-resetRobert Speicher2015-09-301-21/+0
| |/
| * Delegate ci_project parameters to projectsKamil Trzcinski2015-09-301-1/+4
| | | | | | | | | | | | | | - It delegates name, path, gitlab_url, ssh_url_to_repo - Remove ability to set this parameters using CI API This fixes GitLab project rename, namespace change, repository rename, etc.
* | Merge branch 'master' into flevour/gitlab-ce-project-path-insensitive-lookupDouwe Maan2015-10-0122-271/+232
|\ \ | |/
| * Move CI project settings page to CE project settings areamove-ci-settingsDmitriy Zaporozhets2015-09-293-32/+39
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move CI triggers page to project settings areamove-triggers-pageDmitriy Zaporozhets2015-09-292-43/+35
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Move CI variables page to project settingsmove-variables-pageDmitriy Zaporozhets2015-09-284-37/+29
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'move-runners-page'Dmitriy Zaporozhets2015-09-284-77/+76
| |\
| | * Move runners page to project settingsDmitriy Zaporozhets2015-09-254-77/+76
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-281-0/+6
| |\ \
| | * | Add option to admin area to sign in as a specific userPavel Forkert2015-09-241-0/+6
| | | | | | | | | | | | | | | | Closes #2291
| * | | Add user preference to view project activity and starred project activity as ↵Stan Hu2015-09-261-0/+4
| | |/ | |/| | | | | | | | | | | | | default dashboard Closes #2662
| * | Remove CI dashboardDmitriy Zaporozhets2015-09-241-14/+2
| |/ | | | | | | | | | | | | With CI status integrated at GitLab projects page there is no reason to keep it anymore. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Show CI status on commit pageDmitriy Zaporozhets2015-09-241-0/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Check for CI enabled in correct placeDmitriy Zaporozhets2015-09-242-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Add header for ci graphs and check that it is enabledDmitriy Zaporozhets2015-09-241-0/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'master' into move-ci-chartsDmitriy Zaporozhets2015-09-241-0/+5
| |\
View Lorry Controller Status