summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cache-raw-2' into 'master' Douwe Maan2016-03-072-0/+5
|\ | | | | | | | | | | | | | | Set cache headers for raw blobs This changes allows browsers and (in the case of public projects) proxy caches to cache raw Git blob responses. See merge request !3113
| * Refactor caching codeJacob Vosmaer2016-03-072-4/+5
| |
| * Tell clients/proxies to cache raw blob requestsJacob Vosmaer2016-03-032-0/+4
| |
* | Updates from last code review.issue_13621_2Rubén Dávila2016-03-061-4/+0
| |
* | Invalidate cache for builds badgeGrzegorz Bizon2016-03-041-0/+13
| | | | | | | | Closes #13982
* | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-033-12/+13
|/
* Merge branch 'refactor-projects-list' into 'master' Dmitriy Zaporozhets2016-03-031-0/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor projects list 1. Fix double bottom border if pagination 2. Fix broken search on forks page 4. Remove duplicate js logic 4. Remove unused show all link 5. Remove duplicate “no project” message in different views After this merge request you can easily render shared projects template with all necessary html/js included to make searchable list with pagination. All you need to provide is controller that returns projects list with seach nad pagination and render html form with project-filter-form id and text field with filter_projects name. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @DouweM See merge request !3075
| * Refactor projects listDmitriy Zaporozhets2016-03-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix double bottom border if pagination 2. Fix broken search on forks page 4. Remove duplicate js logic 4. Remove unused show all link 5. Remove duplicate “no project” message in different views After this merge request you can easily render shared projects template with all necessary html/js included to make searchable list with pagination. All you need to provide is controller that returns projects list with seach nad pagination and render html form with project-filter-form id and text field with filter_projects name. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'issue_13648' into 'master' Douwe Maan2016-03-031-8/+1
|\ \ | |/ |/| | | | | | | | | | | | | Reuse query from ProjectsFinder to get projects accessible to current user. Fixes #13648 This is a refactor to reuse the existing query from our `ProjectsFinder` class See merge request !3049
| * Add specs to ForksController#index.issue_13648Rubén Dávila2016-03-021-6/+1
| | | | | | | | | | * Also refactor query to get projects accessible for current user. ProjectsFinder actually return public projects when no user is passed.
| * Reuse query from ProjectsFinder to get projects accessible to current user.Rubén Dávila2016-03-011-3/+1
| |
* | Make the tags delete button remote in the tags listfix/13781-delete-tag-without-ajaxRémy Coutable2016-03-011-1/+6
|/
* Merge branch 'safe-content-type' into 'master' Douwe Maan2016-03-012-12/+5
|\ | | | | | | | | | | | | Explain why we mangle blob content types Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/9079 See merge request !2956
| * Explain why we mangle blob content typessafe-content-typeJacob Vosmaer2016-02-242-12/+5
| |
* | Logged in user should be able to read internal forks.Rubén Dávila2016-02-271-1/+1
| |
* | Improve implementation to check read access to forks and add pagination.Rubén Dávila2016-02-261-6/+16
|/
* Correctly checks if tree view is on screenPhil Hughes2016-02-231-1/+1
|
* Fixes issue with file view rows not clickable on project main viewfiles-view-row-clickPhil Hughes2016-02-231-3/+3
| | | | | | | Fixed an issue where it would only load the first 25 commit data on project main view Stopped the file view sending 1 too many requests Fixes #3916
* Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-201-1/+1
|
* Create or mark task pending as soon the action happensDouglas Barbosa Alexandre2016-02-201-0/+2
|
* Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-193-1/+4
|\
| * Label description and Label rowTap2016-02-173-1/+4
| | | | | | | | | | - Add label description - Show label row when filtering issues or merge requests by label
* | Merge branch 'rs-blob' into 'master' Douwe Maan2016-02-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Blob` model that wraps `Gitlab::Git::Blob` This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG. See merge request !2887
| * | Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blobRobert Speicher2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG.
* | | Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-191-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Labels should be visible in milestone view Closes #3276 See merge request !2599
| * | | Add labels tab to milestone detail view.Rubén Dávila2016-02-021-0/+1
| | | |
* | | | More updates from the last code review.Rubén Dávila2016-02-191-1/+2
| | | |
* | | | Fix build and add specsRubén Dávila2016-02-191-8/+0
| | | |
* | | | Some updates after last code review.Rubén Dávila2016-02-191-0/+8
| | | |
* | | | Remove code introduced when endpoint was in MR controller.Rubén Dávila2016-02-191-2/+1
| | | |
* | | | Update copy and URLs used when reverting MRs.Rubén Dávila2016-02-191-3/+23
| | | |
* | | | Check that target_branch is present.Rubén Dávila2016-02-191-1/+1
| | | |
* | | | Reuser revert commit modal in MR detail page.Rubén Dávila2016-02-191-21/+0
| | | |
* | | | Make MRs with revert commit work.Rubén Dávila2016-02-191-2/+5
| | | |
* | | | Add RevertService class with basic logic to revert commitRubén Dávila2016-02-191-0/+13
| | | |
* | | | Add button to revert commit on Commit detail page.Rubén Dávila2016-02-191-0/+7
| | | |
* | | | Some updates from last code review.Rubén Dávila2016-02-191-11/+11
| | | |
* | | | Add some specs plus some refactor.Rubén Dávila2016-02-191-2/+4
| | | |
* | | | Explain why MR can't be reverted.Rubén Dávila2016-02-191-8/+8
| | | |
* | | | Use adequate description for new MR.Rubén Dávila2016-02-191-1/+2
| | | |
* | | | Check target branch exists before creating revert MR.Rubén Dávila2016-02-191-0/+5
| | | |
* | | | Some refactor to the revert commit creation.Rubén Dávila2016-02-191-2/+2
| | | | | | | | | | | | | | | | * Not required to run hooks since it's an internal commit
* | | | Save merge commit id when MR is mergedRubén Dávila2016-02-191-1/+1
| | | |
* | | | Create reverse branch and generate MR with new branch. #3409Rubén Dávila2016-02-191-2/+12
| | | |
* | | | Add new endpoint and button to revert merge. #3409Rubén Dávila2016-02-191-0/+4
| | | |
* | | | Merge branch 'ci/remove-builds' into 'master' Grzegorz Bizon2016-02-191-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to erase build content (artifacts, trace) This feature makes it possible to remove build content - build artifacts and build traces. - [x] Remove artifacts - [x] Remove metadata - [x] Remove build traces - [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged - [x] Fix the permissions after the merge Closes #3421 See merge request !2560
| * | | | Move build erasable implementation from concern to modelGrzegorz Bizon2016-02-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3659905
| * | | | Update relevant build fields when build is erasedGrzegorz Bizon2016-02-191-1/+1
| | | | |
| * | | | Add build eraseable feature implementationGrzegorz Bizon2016-02-191-4/+4
| | | | |
| * | | | Add build remove button to build summary viewGrzegorz Bizon2016-02-191-0/+6
| | |/ / | |/| |
View Lorry Controller Status