summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | 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
| | | | | | |
| * | | | | | Merge branch 'cross-reference-mr-on-issues' into 'master' Douwe Maan2015-10-182-1/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show merge requests which close current issue Closes #2903 ### What does this MR do If an issue is to be closed by a merge request the current user has access to, this will be displayed when the user looks at the issue. ![Screenshot_from_2015-10-12_12-10-37](https://gitlab.com/zj/gitlab-ce/uploads/52e429704e73067b24b69801f13ad7bc/Screenshot_from_2015-10-12_12-10-37.png) /cc @DouweM See merge request !1569
| | * | | | | 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
| | | |_|/ / | | |/| | |
* | | | | | Only pass abuse report ID to AbuseReportMailer.Douwe Maan2015-10-181-3/+4
| | | | | |
* | | | | | Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notifyDouwe Maan2015-10-1834-304/+284
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'redirect-ci-dash' into 'master' Dmitriy Zaporozhets2015-10-171-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary bring /ci page page with help information Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1630
| | * | | | | Temporary bring /ci page page with help informationDmitriy Zaporozhets2015-10-171-3/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Redirect old CI project route to GitLab projectDmitriy Zaporozhets2015-10-171-0/+5
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix builds view count indicatorKamil Trzcinski2015-10-151-2/+2
| | | | |
| * | | | Merge branch 'fix/improve_reset_service_password_v2' into 'master' Valery Sizov2015-10-152-2/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-152-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-152-14/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1525-224/+188
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Always return HTML in git_not_foundJacob Vosmaer2015-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to give a nice 404 for e.g. archive.zip.
| | * | | | | 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-142-3/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1313-23/+19
| | |/ / / | |/| | |
| * | | | Make group deleted text consistent with group created and updated textsteuneboon2015-10-121-1/+1
| | | | |
| * | | | Fix typo(missing quote) when deleting groupsteuneboon2015-10-121-1/+1
| |/ / /
| * | | 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>
View Lorry Controller Status