summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve consistency of SSH Keys title in administration areassh-key-settingsRobert Speicher2016-03-031-1/+1
|
* Restructure SSH key table partial renderingRobert Speicher2016-03-032-12/+10
| | | | | Prior, we were double-checking `@keys.any?`, and unnecessarily assigning `is_admin` in a view where it wasn't needed.
* Don't abuse the flash store for displaying SSH Key form errorsRobert Speicher2016-03-031-2/+3
|
* Remove `Profile::KeysController#new` actionRobert Speicher2016-03-035-17/+2
|
* Move SSH key JS to Profile CS classRobert Speicher2016-03-032-11/+9
|
* SSH key ellipsis on mobilePhil Hughes2016-03-032-2/+16
|
* Changed link colourPhil Hughes2016-03-031-1/+1
|
* Content link colour in profile settingsPhil Hughes2016-03-033-3/+12
|
* Fixed heading boldPhil Hughes2016-03-032-0/+15
| | | | Button transparent colours
* Fixed failing ssh key testsPhil Hughes2016-03-033-4/+4
|
* SSH keys settingsPhil Hughes2016-03-038-50/+64
| | | | Closes #13860
* Merge branch 'password-settings' into 'master' Jacob Schatz2016-03-033-37/+31
|\ | | | | | | | | | | | | | | | | Password settings page Closes #13858 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ebb9b67d69daa8872d79626b85f99b52/password-settings.png) See merge request !3033
| * Heading spacingpassword-settingsPhil Hughes2016-03-021-1/+1
| |
| * Fixed failing password testsPhil Hughes2016-03-022-4/+4
| |
| * Password settings pagePhil Hughes2016-03-022-34/+28
| | | | | | | | Closes #13858
* | Merge branch 'lazy-diffs' into 'master' Jacob Vosmaer2016-03-0336-294/+192
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lazy diffs Needs https://gitlab.com/gitlab-org/gitlab_git/merge_requests/65 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/10785 - Use Gitlab::Git::DiffCollection which limits the result set size. This avoids loading unnecessary data from Git/SQL into memory. - Remove left-over Grit timeout handling code. - Use Gitlab::Git::Count.lines to count lines in strings. - Use more iterators. See merge request !2705
| * | Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-0336-294/+192
| | |
* | | Merge branch 'comment-button-status-refresh' into 'master' Jacob Schatz2016-03-031-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correcly updates the status of the comment buttons on reload Closes #5534 ![comment-reload](/uploads/413df488222cacfb02a5ea7592abfd11/comment-reload.gif) See merge request !3081
| * | | Correcly updates the status of the comment buttons on reloadPhil Hughes2016-03-031-3/+3
| |/ / | | | | | | | | | Closes #5534
* | | Merge branch 'email-settings' into 'master' Jacob Schatz2016-03-033-46/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emails settings Closes #13857 ![](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87ee4b0abf970c1fbb5e8a8c02740c/email-settings.png) See merge request !3032
| * | | Removed page specific variablesemail-settingsPhil Hughes2016-03-032-6/+5
| | | |
| * | | Heading spacingPhil Hughes2016-03-031-2/+3
| | | |
| * | | Moved colour values into scss variablesPhil Hughes2016-03-032-3/+7
| | | | | | | | | | | | | | | | Fixed bold issue with headings
| * | | Emails settingsPhil Hughes2016-03-032-46/+56
| | | | | | | | | | | | | | | | Closes #13857
* | | | Merge branch 'issue_13933' into 'master' Jacob Schatz2016-03-031-1/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Include pagination for other than projects search Pagination for projects results is already added on views/shared/projects/_list.html.haml Fixes #13933 See merge request !3056
| * | | Place pagination outside .search-resultsissue_13933Alfredo Sumaran2016-03-021-1/+3
| | | |
| * | | Include pagination for other than projects searchAlfredo Sumaran2016-03-011-1/+1
| | | |
* | | | Merge branch 'fix-explore-projects' into 'master' Dmitriy Zaporozhets2016-03-033-39/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI for explore projects page Move visibility and tags filter inline with navigation links Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !3079
| * | | | Use helper for font-awesome iconsfix-explore-projectsDmitriy Zaporozhets2016-03-031-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve UI for explore projects pageDmitriy Zaporozhets2016-03-033-39/+42
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Add 8.5.3 CHANGELOG itemsRémy Coutable2016-03-031-0/+3
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'renaming-repository-caching' into 'master' Rémy Coutable2016-03-032-7/+88
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flush repository caches before renaming projects This should hopefully solve gitlab-org/gitlab-ce#13790. Once I know the exact steps to reproduce the problem I should be able to confirm this. cc @dblessing @inem See merge request !2974
| * | | | Flush repository caches before renaming projectsrenaming-repository-cachingYorick Peterse2016-02-262-7/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that if a project is later re-created using the old path it doesn't end up re-using the old cache. This also ensures we don't keep the cache around until its expired by Redis itself. Fixes gitlab-org/gitlab-ce#13790
* | | | | Revert "Sort starred projects on dashboard based on last activity by default"Dmitriy Zaporozhets2016-03-032-2/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 70d6455284717f938016b1e1b569e0d0dadb11fc.
* | | | | Sort starred projects on dashboard based on last activity by defaultDmitriy Zaporozhets2016-03-032-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'refactor-projects-list' into 'master' Dmitriy Zaporozhets2016-03-0311-103/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Remove unnecessary project limit argument from group projects pagerefactor-projects-listDmitriy Zaporozhets2016-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Refactor projects listDmitriy Zaporozhets2016-03-0311-103/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-032-8/+73
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-022-6/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 'todos-counter' into 'master' Dmitriy Zaporozhets2016-03-031-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use normal font weight for todos counter Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3076
| * | | | | | Use normal font weight for todos countertodos-counterDmitriy Zaporozhets2016-03-031-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'issue_4095' into 'master' Dmitriy Zaporozhets2016-03-037-4/+45
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show Issues/MRs from archived projects in Groups view Fixes #4095 See merge request !2980
| * | | | | Update CHANGELOG.issue_4095Rubén Dávila2016-03-021-0/+1
| | | | | |
| * | | | | Don't list merge requests from archived projects in Group view.Rubén Dávila2016-03-023-1/+21
| | | | | |
| * | | | | Don't list issues from archived projects in Group view.Rubén Dávila2016-03-025-3/+23
| | |_|/ / | |/| | |
* | | | | Merge branch 'improve-user-tabs' into 'master' Jacob Schatz2016-03-0311-117/+353
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add routes and actions for dynamic tab loading. Closes #13588 and #13584 See merge request !2961
| * | | | | Re-use previous lineimprove-user-tabsAlfredo Sumaran2016-03-021-5/+4
| | | | | |
| * | | | | Remove unnecesary assignmentAlfredo Sumaran2016-03-021-1/+0
| | | | | |