summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Enable shared runners for all new projectsKamil Trzcinski2015-11-051-0/+1
|
* 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.
* Allow groups to appear in the search results if the group owner allows itValery Sizov2015-11-051-3/+3
|
* Merge branch 'fix-infinite-redirect' into 'master' Stan Hu2015-11-041-7/+15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Only redirect to homepage url when its not the root url It was possible to create an infi redirect when the user set up the `home_page_url` to redirect to the main URL of the gitlab instance. This fix makes sure this redirect is not possible. Fixes #1020 /cc @dblessing See merge request !1703
| * Only redirect to homepage url when its not the root urlJeroen van Baarsen2015-11-021-7/+15
| | | | | | | | | | | | | | | | | | | | | | It was possible to create an infi redirect when the user set up the `home_page_url` to redirect to the main URL of the gitlab instance. This fix makes sure this redirect is not possible. Fixes !1020 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Merge branch 'olhado/gitlab-ce-commit-search'Dmitriy Zaporozhets2015-11-031-2/+2
|\ \
| * | Add support for searching commit log messagesJonathan Schoeffling2015-10-281-2/+2
| |/ | | | | | | | | | | | | | | Include the log messages of recent commits in project-level search results, providing functionality similar to 'git log --grep'. Update repository model rspec tests to validate the output of Repository#commits_with_log_matching.
* | fix deprecatedKON YUICHI2015-10-311-1/+1
| |
* | 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.
* Remove deprecated CI events from project settings pageDmitriy Zaporozhets2015-10-282-23/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #9771 from kazubu/fix_error_destroy_without_refererStan Hu2015-10-261-5/+1
|\ | | | | Fix: 500 error returned if destroy request without HTTP referer
| * modify to use redirect_back_or_default functionkazubu2015-10-261-5/+1
| |
| * Fix: 500 error returned if destroy request without HTTP refererkazubu2015-10-261-1/+1
| |
* | Fix specific runner visibilityKamil Trzcinski2015-10-261-5/+4
|/
* Merge branch 'fix-ci-regressions' into 'master' Robert Speicher2015-10-234-14/+23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix broken Runners admin pageKamil Trzcinski2015-10-231-0/+1
| |
| * Allow developer to manage buildsKamil Trzcinski2015-10-233-10/+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-2124-45/+97
| |\ \
| * | | Update style of snippets pagesDouwe Maan2015-10-181-0/+1
| | | |
* | | | Merge branch 'project-path-case-sensitivity' into 'master' Robert Speicher2015-10-221-1/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Prefer project with exact path to differently cased one when both exist. Fixes #3113. See merge request !1649
| * | | Move case sensitivity check to find_with_namespace.Douwe Maan2015-10-211-2/+1
| | | |
| * | | Prefer project with exact path to differently cased one when both exist.Douwe Maan2015-10-201-2/+2
| | | |
* | | | 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-2016-28/+41
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fix duplicate repositories in GitHub import pageStan Hu2015-10-191-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, all the current user's repositories are accessible via the /users endpoint. There's no need to traverse all the organization repositories as well. See: * http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method * https://developer.github.com/v3/repos/#list-your-repositories Closes #2523
* | | Merge branch 'grzesiek/gitlab-ce-fix/non-member-notification-button'Robert Speicher2015-10-191-1/+1
|\ \ \
| * \ \ Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-194-7/+36
| |\ \ \ | | |/ / | | | | | | | | [ci skip]
| * | | Find correct group membership.Douwe Maan2015-10-181-2/+1
| | | |
| * | | Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-buttonDouwe Maan2015-10-1824-51/+83
| |\ \ \
| * | | | Show notifications button even if user is not member of a projectGrzegorz Bizon2015-10-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notifications button was unavailable if user wasn't member of the project, even if protected project is available via group privileges. Showing disabled button with explanation tool-tip is less confusing. This closes #2846.
* | | | | Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-194-7/+36
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | [ci skip]
| * | | | Merge branch 'add-files-optionto-changelog'Dmitriy Zaporozhets2015-10-191-0/+2
| |\ \ \ \
| | * | | | Add changelog itemadd-files-optionto-changelogDouwe Maan2015-10-191-0/+2
| | | | | |
| * | | | | 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
| * | | | Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into ↵Douwe Maan2015-10-191-1/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add ability to remove the fork relationship from project settings ![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png) ![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png) Replaces !1579. Fixes #2578. See merge request !1636
| | * | | | Tweak wording.Douwe Maan2015-10-181-1/+3
| | | | | |
| | * | | | Merge branch 'master' into remove-forks-from-projects-settingsHan Loong Liauw2015-10-1722-47/+74
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Made suggested content changes based on MR ReviewHan Loong Liauw2015-10-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the authentication method for removing fork through API Reflected changes to new auth method in API specs
| | * | | | Adds ability to remove the forked relationshipHan Loong Liauw2015-10-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
| * | | | | Merge branch 'cristianbica/gitlab-ce-user-project-view-files' into 'master' Dmitriy Zaporozhets2015-10-191-0/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to select the Files view as default project view ![Screen_Shot_2015-10-17_at_19.24.01](/uploads/c3194db856f5e5e1b3493302c0a479a5/Screen_Shot_2015-10-17_at_19.24.01.png) Also shows the readme at the very bottom, like on the regular Files page. Replaces !1489. Closes #2655. See merge request !1632
| | * | | | | Only load tree when project has repository to prevent 404Douwe Maan2015-10-181-1/+5
| | | | | | |
| | * | | | | Set vars used by tree view in project show action.Douwe Maan2015-10-171-4/+8
| | | | | | |
| | * | | | | Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-filesDouwe Maan2015-10-1741-378/+364
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Allow users to select the Files view as default project viewCristian Bica2015-10-011-1/+4
| | | | | | |