summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Use before_action instead of before_filterDouglas Barbosa Alexandre2016-02-211-1/+1
|
* Add "Mark all as done" buttonDouwe Maan2016-02-201-1/+15
|
* Fix rubucop offensesDouglas Barbosa Alexandre2016-02-201-2/+0
|
* Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-203-22/+24
|
* Create or mark task pending as soon the action happensDouglas Barbosa Alexandre2016-02-201-0/+2
|
* Add filters by project, author, type, and action to task queue page listDouglas Barbosa Alexandre2016-02-201-7/+1
|
* Fix rubocop offensesDouglas Barbosa Alexandre2016-02-201-5/+5
|
* Remove task abilities, since we will only ever show the user their ownDouglas Barbosa Alexandre2016-02-201-8/+0
|
* Add pending tasks badge on top right next to the new and logout buttonDouglas Barbosa Alexandre2016-02-201-3/+0
|
* Allow user to mark each task as done manuallyDouglas Barbosa Alexandre2016-02-201-0/+23
|
* Add tasks queue list pageDouglas Barbosa Alexandre2016-02-201-0/+15
|
* Merge branch 'visibletrap/gitlab-ce-label'Douwe Maan2016-02-196-2/+9
|\
| * Find label in issues_finderTap2016-02-192-2/+2
| |
| * Label description and Label rowTap2016-02-176-2/+9
| | | | | | | | | | - 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
| | | |
* | | | Use the adequate success path on the JSON endpoint.Rubén Dávila2016-02-191-1/+1
| | | | | | | | | | | | | | | | I forgot to update this and some spinach specs were failing.
* | | | More updates from the last code review.Rubén Dávila2016-02-191-1/+2
| | | |
* | | | Fix build and add specsRubén Dávila2016-02-193-10/+11
| | | |
* | | | Some updates after last code review.Rubén Dávila2016-02-192-15/+35
| | | |
* | | | Add link to fork if user can't revert MR.Rubén Dávila2016-02-191-1/+1
| | | |
* | | | 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-192-5/+19
| | | |
* | | | 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
| | | | |
* | | | | Mention project name in fork noticeAchilleas Pipinellis2016-02-191-1/+1
|/ / / /
* | | | Merge branch 'saml-decoupling' into 'master'Patricio Cano2016-02-191-18/+36
|\ \ \ \
| * | | | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-18/+36
| | |/ / | |/| |
* | | | Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-191-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
| * | | Update Emoji asset pathRobert Speicher2016-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.