summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Correctly set comparison first commit when range includes a merge commitcompare-first-commitDouwe Maan2015-11-171-2/+2
|
* CI details cleanupKamil Trzcinski2015-11-052-19/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | - Add page titles to CI settings. - Fix CI admin navigation. - Remove duplicated scope. - Use monospace font for commit sha. - Add page title and header title to build page. - Proper authorization for cancel/retry builds. - Use gitlab pagination theme for builds and group members. - Don't paginate builds widget on build page. - Add badges to commit page Changes/Builds tabs. - Add "Builds" to commit Builds tab page title. - Add and use Ci::Build#retryable? method. - Add CI::Build#retried? method. - Allow all failed commit builds to be retried. - Proper authorization for cancel/retry all builds. - Remove unused param. - Use time_ago_with_tooltip where appropriate. - Tweak builds index text - Remove duplication between builds/build and commit_statuses/commit_status. - Use POST rather than GET for canceling and retrying builds. - Remove redundant URL helpers. - Add build ID to build page. - Link branch name on build page. - Move commit/:sha/ci to commit/:sha/builds.
* Add ability to create directories in the editorBen Ford2015-10-291-1/+1
| | | | | | | | | | | | | Simply type a name with a `/` directory separator and new directories will be created. This does not do the fancy UI work that github.com does, but it will get the job done. I could not find tests for file creation, so I didn't add a test for this slight behaviour modification. I did test directory traversals though, using both absolute paths like `/tmp/foo.txt` and relative paths like `../../foo.txt`. Neither case escaped the repository, though attempting to traverse with a relative path resulted in a 500 error that did not affect application stability upon reload.
* Fix specific runner visibilityKamil Trzcinski2015-10-261-5/+4
|
* Merge branch 'fix-ci-regressions' into 'master' Robert Speicher2015-10-232-6/+22
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI regressions This MR fixes a couple of small CI regressions - Allow developer to manage builds - On CI Admin page show only projects that are present in GitLab - On Runner CI Admin page show only projects that are present in GitLab - Refresh build log only when status changes - Show the oldest builds on top when viewing Builds - it most cases it shows running builds on top - Fix Lint rendering - Fix number of other builds in build widget Fixes #3164 Fixes #3161 Fixes gitlab-org/gitlab-ci#343 See merge request !1679
| * Allow developer to manage buildsKamil Trzcinski2015-10-232-2/+17
| |
| * Fix small CI UI regressionsKamil Trzcinski2015-10-231-4/+5
| |
* | Merge branch 'comments_fix' into 'master' Dmitriy Zaporozhets2015-10-231-1/+1
|\ \ | |/ |/| | | | | | | | | Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork https://dev.gitlab.org/gitlab/gitlabhq/issues/2535 See merge request !1675
| * Fix: Inability to reply to code comments in the MR view, if the MR comes ↵comments_fixValery Sizov2015-10-221-1/+1
| | | | | | | | from a fork
* | Merge branch 'hanloong/gitlab-ce-add-dates-snippets-show' into 'master' Dmitriy Zaporozhets2015-10-221-0/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Update style of snippets pages ![Screen_Shot_2015-10-18_at_13.04.13](/uploads/95d58b64fa81aa4e75568d2d7b4a6b08/Screen_Shot_2015-10-18_at_13.04.13.png) ![Screen_Shot_2015-10-21_at_11.11.10](/uploads/106371d718a07a9ccdad9148812211fd/Screen_Shot_2015-10-21_at_11.11.10.png) Replaces !1567. Fixes #1767 and #2538. See merge request !1637
| * Merge branch 'master' into hanloong/gitlab-ce-add-dates-snippets-showDouwe Maan2015-10-2111-18/+26
| |\
| * | Update style of snippets pagesDouwe Maan2015-10-181-0/+1
| | |
* | | Fix 500 when editing CI servicesKamil Trzcinski2015-10-221-4/+4
| |/ |/|
* | Merge branch 'merge-request-deleted-file' into 'master' Dmitriy Zaporozhets2015-10-202-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Correctly find last known blob for file deleted in MR. Fixes #3092. When building a new MR, `@merge_request.commits.last` would fail because this delegates to `merge_request_diff` which is still `nil` at that point. I fixed that, and changed some of the logic because showing deleted blob contents didn't previously work for the Compare page, and the UI would show the wrong commit sha for "View File @...". See merge request !1647
| * | Correctly find last known blob for file deleted in MR.merge-request-deleted-fileDouwe Maan2015-10-202-2/+6
| | |
* | | Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-208-10/+11
|/ / | | | | | | | | | | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* | Improve performance of sorting milestone issuesYorick Peterse2015-10-191-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This cuts down the time it takes to sort issues of a milestone by about 10x. In the previous setup the code would run a SQL query for every issue that had to be sorted. The new setup instead runs a single SQL query to update all the given issues at once. The attached benchmark used to run at around 60 iterations per second, using the new setup this hovers around 600 iterations per second. Timing wise a request to update a milestone with 40-something issues would take about 760 ms, in the new setup this only takes about 130 ms. Fixes #3066
* | Only accept open issues and merge requestsZeger-Jan van de Weg2015-10-161-1/+1
| |
* | Show merge requests which close current issueZeger-Jan van de Weg2015-10-162-1/+8
|/
* Fix builds view count indicatorKamil Trzcinski2015-10-151-2/+2
|
* Merge branch 'fix/improve_reset_service_password_v2' into 'master' Valery Sizov2015-10-151-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | Improve invalidation of stored service password if the endpoint URL is changed (V2) New version of !1583, using the same failproof logic but this time mirroring the name and behaviour of the change-tracking methods of ActiveModel::Dirty in order to make it clearer and more natural. Added more tests to clarify the expected behaviour. This is an alternative to !1594 /cc @vsizov @rspeicher See merge request !1600
| * Improve invalidation of stored service password if the endpoint URL is changedimprove_reset_service_password_v2Alex Lossent2015-10-151-1/+7
| | | | | | | | | | Password can now be specified at the same time as the new URL, and the service template admin pages now work.
* | Merge branch 'view-issue-performance'Dmitriy Zaporozhets2015-10-151-1/+1
|\ \
| * | Renamed Note.inc_associations to with_associationsYorick Peterse2015-10-151-1/+1
| | |
| * | Eager load various issue/note associationsYorick Peterse2015-10-151-1/+1
| |/ | | | | | | | | This ensures we don't end up running N+1 queries for the objects in the affected collections.
* | Merge branch 'git-archive-golang' into 'master' Douwe Maan2015-10-151-13/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Let gitlab-git-http-server handle archive downloads This change relies on changes in gitlab_git and gitlab-git-http-server. fixes #2429 See merge request !1548
| * \ Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-1511-15/+171
| |\ \ | | |/
| * | Let gitlab-git-http-server handle archive downloadsJacob Vosmaer2015-10-081-13/+4
| | | | | | | | | | | | This change relies on changes in gitlab_git and gitlab-git-http-server.
* | | Merge branch 'builds-view' into 'master' Kamil Trzciński2015-10-151-2/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added builds view ![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png) /cc @dzaporozhets @vsizov See merge request !1593
| * | | Fix specsKamil Trzcinski2015-10-141-6/+6
| | | |
| * | | Refactor builds viewKamil Trzcinski2015-10-141-5/+5
| | | |
| * | | Added builds viewKamil Trzcinski2015-10-141-2/+23
| | | |
* | | | Merge branch 'fix-path-with-leading-dot-error' into 'master' Dmitriy Zaporozhets2015-10-151-0/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error preventing displaying of commit data for a directory with a leading dot Directories with leading dots erroneously get rejected by the route controller if git ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller. Closes https://github.com/gitlabhq/gitlabhq/issues/8763 See merge request !1574
| * | | Fix error preventing displaying of commit data for a directory with a ↵Stan Hu2015-10-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | leading dot Closes https://github.com/gitlabhq/gitlabhq/issues/8763
* | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-142-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Simplify code around (cross)-references See merge request !1568
| * | | | Simplify code around (cross)-referencesDouwe Maan2015-10-122-2/+2
| |/ / /
* | | | Show warning if build doesn't have runners with specified tags or runners ↵Kamil Trzcinski2015-10-141-1/+1
| |/ / |/| | | | | | | | | | | | | | | | | | | | didn't connect recently Slightly refactor runner status detection: moving it to Runner class Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
* | | Only render 404 page from /publicinified_404_errorValery Sizov2015-10-135-9/+9
|/ /
* | Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-073-0/+87
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-071-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Move CI services to project settings areaDmitriy Zaporozhets2015-10-071-0/+49
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove Ci::Commit and Ci::Build controllerscleanup-ci-pagesDmitriy Zaporozhets2015-10-072-0/+38
| | | | | | | | | | | | 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
* | Cleanup CI code after refactoring and fix several 500 errorsDmitriy Zaporozhets2015-10-061-1/+1
| | | | | | | | 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>
* | Render CI statuses on commit pageDmitriy Zaporozhets2015-10-061-0/+7
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-051-0/+45
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge remote-tracking branch 'upstream/master'Guilherme Garnier2015-10-031-1/+3
|\
| * Hide password in the service settings formhide_services_passwordValery Sizov2015-10-021-1/+3
| |
* | Fix rubocop warnings in appGuilherme Garnier2015-10-031-1/+1
|/
View Lorry Controller Status