summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Add option to show archived projects on dahsboardDmitriy Zaporozhets2016-03-043-22/+28
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge remote-tracking branch 'origin/sort-starred-projects'Dmitriy Zaporozhets2016-03-041-1/+1
|\
| * Revert "Revert "Sort starred projects on dashboard based on last activity by ↵sort-starred-projectsDmitriy Zaporozhets2016-03-031-1/+1
| | | | | | | | | | | | default"" This reverts commit 617bb1096deb1fb5dea66d04b9bbd7da0dfb57ba.
* | Invalidate cache for builds badgeGrzegorz Bizon2016-03-041-0/+13
| | | | | | | | Closes #13982
* | Don't abuse the flash store for displaying SSH Key form errorsRobert Speicher2016-03-031-2/+3
| |
* | Remove `Profile::KeysController#new` actionRobert Speicher2016-03-031-4/+0
| |
* | Fixed failing ssh key testsPhil Hughes2016-03-031-1/+1
| |
* | SSH keys settingsPhil Hughes2016-03-031-2/+3
| | | | | | | | Closes #13860
* | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-033-12/+13
|/
* Revert "Sort starred projects on dashboard based on last activity by default"Dmitriy Zaporozhets2016-03-031-1/+1
| | | | This reverts commit 70d6455284717f938016b1e1b569e0d0dadb11fc.
* Sort starred projects on dashboard based on last activity by defaultDmitriy Zaporozhets2016-03-031-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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
| |
* | Merge branch 'issue_4095' into 'master' Dmitriy Zaporozhets2016-03-032-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Don't show Issues/MRs from archived projects in Groups view Fixes #4095 See merge request !2980
| * | Don't list merge requests from archived projects in Group view.Rubén Dávila2016-03-021-1/+1
| | |
| * | Don't list issues from archived projects in Group view.Rubén Dávila2016-03-021-1/+1
| | |
* | | Merge branch 'improve-user-tabs' into 'master' Jacob Schatz2016-03-031-7/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add routes and actions for dynamic tab loading. Closes #13588 and #13584 See merge request !2961
| * \ \ Merge branch 'master' into improve-user-tabsAlfredo Sumaran2016-03-015-24/+29
| |\ \ \ | | | |/ | | |/|
| * | | Make url and actions to be the same nameAlfredo Sumaran2016-03-011-2/+2
| | | |
| * | | Respond with 'show' view. Tab content will be loaded dinamicallyAlfredo Sumaran2016-03-011-3/+3
| | | |
| * | | Respond to .json requestsAlfredo Sumaran2016-02-291-3/+24
| | | |
| * | | Add routes and actions for dynamic tab loadingJosh Frye2016-02-291-7/+32
| | | |
* | | | Merge branch 'fix/13781-delete-tag-without-ajax' into 'master' Rémy Coutable2016-03-021-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag deletion doesn't use AJAX anymore See merge request !2986
| * | | | Make the tags delete button remote in the tags listfix/13781-delete-tag-without-ajaxRémy Coutable2016-03-011-1/+6
| | |/ / | |/| |
* | | | Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' ↵Douwe Maan2016-03-021-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Don't show "Welcome to GitLab" when the search didn't return any projects Fixes #13785. /cc @pixdrift ### Before ![Screen_Shot_2016-03-02_at_10.55.02](/uploads/b6b6ead2143d01e374ad296e72182d79/Screen_Shot_2016-03-02_at_10.55.02.png) ### After ![Screen_Shot_2016-03-02_at_12.12.33](/uploads/6e16c44e69039c534ea0fc3373c6060b/Screen_Shot_2016-03-02_at_12.12.33.png) See merge request !3059
| * | | | Don't show "Welcome to GitLab" when the search didn't return any projectsRémy Coutable2016-03-021-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'fix/deprecated-ci-badge-permissions' into 'master' Douwe Maan2016-03-021-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix permissions for deprecated CI build status badge This fixes permissions for deprecated status badge, being unavailable even if project is public. Closes #13324 See merge request !3030
| * | | 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 'logged-out-search' into 'master' Robert Speicher2016-03-011-0/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Logged out search Fixes #13676 See merge request !3045
| * | | Enable search for logged-out usersDmitriy Zaporozhets2016-03-011-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'rs-improve-grace-period' into 'master' Douwe Maan2016-03-011-5/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show any "2FA required" message if it's not actually required Prior, if the user had enabled and then disabled 2FA, they would be shown a "You must enable Two-factor Authentication for your account." message when going back to re-activate it, even if 2FA enforcement was disabled. See merge request !3014
| * | | Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-periodRobert Speicher2016-02-291-5/+7
| |/ / | | | | | | | | | | | | | | | | | | Prior, if the user had enabled and then disabled 2FA, they would be shown a "You must enable Two-factor Authentication for your account." message when going back to re-activate it, even if 2FA enforcement was disabled.
* | | 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
| | | |
* | | | Merge branch 'fix/contributions-forked-projects' into 'master' Douwe Maan2016-03-011-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | include contributions from forked projects on profile calendar Shows contributions from forked projects in the calendar Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3612 See merge request !2918
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-02-296-6/+73
| |\ \ \ | | | |/ | | |/| | | | | fix/contributions-forked-projects
| * | | include contributions from forked projects on profile calendarJames Lopez2016-02-221-1/+1
| | | |
* | | | 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
| | | |
View Lorry Controller Status