summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Do not require authentication for CI status badgefix/deprecated-ci-badge-permissionsGrzegorz Bizon2016-03-011-1/+0
| | | | | This changes only deprecated CI badge that we keep for backwards compatibility. See !3030#note_4041498.
* Fix deprecated CI build status badge permissionsGrzegorz Bizon2016-03-011-0/+3
|
* Merge branch 'issue_13648' into 'master' Dmitriy Zaporozhets2016-02-291-6/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | Improve implementation to check read access to forks and add pagination. Fixes #13648 The following optimizations where made: - Pagination was added. - Code to check for read permissions to forks was optimized, in the past we were doing too many queries for each project. See merge request !2991
| * 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
| |
* | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-292-2/+60
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Branded appearance to CE Closes #11489 The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too. TODO: - [x] Copy docs - [x] Make new screenshots - [ ] Remove Custom Welcome message feature? @rymai: I was unsure what labels to add to ping you, so I just ping you like this :wink: /cc @DouweM See merge request !2927
| * | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-262-2/+60
| |/ | | | | | | | | The only major difference with the EE version is the change from a light and dark logo to only a header logo The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
* | 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
| |\ | | | | | | | | | | | | | | | | | | Load award emoji picker with ajax request Fixes #13301. See merge request !2888
| | * 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 done Closes #13681 See merge request !2926
| | * | 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
| |/ / | | | | | | | | | | | | | | | | | | 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
| | | | | |
View Lorry Controller Status