summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-241-0/+6
|\
| * Merge branch 'issue_13301_emoji-menu' into 'master' Robert Speicher2016-02-241-0/+6
| |\
| | * Update award_emoji testAnnabel Dunstone2016-02-231-1/+2
| | * Create EmojisControllerAnnabel Dunstone2016-02-222-4/+5
| | * Load award emoji picker with ajax requestAnnabel Dunstone2016-02-181-0/+4
* | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2319-45/+198
|\ \ \ | |/ /
| * | Merge branch 'fix-todos' into 'master' Robert Speicher2016-02-231-1/+1
| |\ \
| | * | Does not raise an error when Todo is already marked as doneDouglas Barbosa Alexandre2016-02-231-1/+1
| * | | 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
| |/ /
| * | 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
| * | | Merge branch 'rs-blob' into 'master' Douwe Maan2016-02-201-1/+1
| |\ \ \
| | * | | Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blobRobert Speicher2016-02-181-1/+1
| * | | | Merge branch 'issue_3276' into 'master' Jacob Schatz2016-02-191-0/+1
| |\ \ \ \
| | * | | | 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
| * | | | | 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
| * | | | | 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
| |\ \ \ \ \