summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* In search autocomplete show only groups and projects you are member ofbetter-search-autocompleteDmitriy Zaporozhets2016-02-041-2/+2
| | | | | | | | For big instances search autocomplet is flooded with groups you have no access to and insternal/public projects you don't care. It affects way how easily you can go to group/project you are actually member of Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Sort projects by last activity for new issue dropdownnew-issue-projects-sortDmitriy Zaporozhets2016-02-041-1/+1
| | | | | | | When creating new issue from dashboard page I want to see projects sorted by last activity instead of ID Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'wipMergeSpacing' into 'master' Douwe Maan2016-02-041-1/+1
|\ | | | | | | | | | | | | | | | | | | No space required after WIP identifier Fixes #2426 Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap"). See merge request !1876
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacingTed Hogan2015-12-29546-5570/+8205
| |\
| * | No space required after WIP identifierTed Hogan2015-11-231-1/+1
| | | | | | | | | | | | Modified changelog
* | | Merge branch 'sort-projects-dropdown' into 'master' Dmitriy Zaporozhets2016-02-043-3/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort projects by last activity for project switcher in header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13172 See merge request !2692
| * | | Satisfy rubocopDmitriy Zaporozhets2016-02-041-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Sort projects by last activity for project switcher in headersort-projects-dropdownDmitriy Zaporozhets2016-02-033-3/+8
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' into use-top-areaDmitriy Zaporozhets2016-02-0317-54/+47
|\ \ \ \ | |/ / / | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'dashboard-sort-dropdown' into 'master' Dmitriy Zaporozhets2016-02-0310-38/+39
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sort dropdown to dashboard projects page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> First step to improve projects page. Related to !2568 and #3968 See merge request !2691
| | * | | Add sort dropdown to dashboard projects pagedashboard-sort-dropdownDmitriy Zaporozhets2016-02-0310-38/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'attach-file-cursor-position' into 'master' Jacob Schatz2016-02-031-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the markdown link at the cursor poisition When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position ![drop-image-markdown](/uploads/52f41e38faca48c9ee01a02a75ec71be/drop-image-markdown.gif) Tested in Chrome & Firefox and both working fine :thumbsup: Fixes #12822 cc. @jschatz1 See merge request !2648
| | * | | | Keeps cursor at the correct place after changing text in dropzonePhil Hughes2016-01-291-7/+2
| | | | | |
| | * | | | Adds the markdown link at the cursor poisitionPhil Hughes2016-01-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position Fixes #12822
| * | | | | Merge branch 'remove-useless-text-tips' into 'master' Jacob Schatz2016-02-034-12/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove useless text tips on commonly used pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2687
| | * | | | | Remove useless text tips on commonly used pagesDmitriy Zaporozhets2016-02-034-12/+0
| | | |/ / / | | |/| | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Fix missing space between fork and star iconsui-fixesDmitriy Zaporozhets2016-02-032-2/+6
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Use top-area component for top page navigation for pages that contains list ↵Dmitriy Zaporozhets2016-02-038-57/+78
|/ / / / | | | | | | | | | | | | | | | | | | | | of items Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'improve-groups-list' into 'master' Jacob Schatz2016-02-0310-160/+179
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI consistency between projects and groups lists * add group description to the list * move new group button to top nav * move projects/users count icons to the right Fixes #3939 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2677
| * | | | Use right margin for componened other than button for top navDmitriy Zaporozhets2016-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Tried to align form input vertically with other elements for top navDmitriy Zaporozhets2016-02-032-6/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Make nav-controls responsive and hide on extra small screensDmitriy Zaporozhets2016-02-032-16/+42
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor nav controls section (search and new project/group btn)Dmitriy Zaporozhets2016-02-037-140/+107
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add number_with_delimiter and remove unnecessary dara placement for groups pageDmitriy Zaporozhets2016-02-032-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve UI consistency between projects and groups listsDmitriy Zaporozhets2016-02-034-20/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Support download access by PRIVATE-TOKEN headerStan Hu2016-02-031-0/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no way to download a raw file without embedding the token in the URL, which exposes the token in the URL. There should be an way of sending this information via the header as the API does. Closes https://github.com/gitlabhq/gitlabhq/issues/8137
* | | | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-0312-4/+140
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
| * | | | Hide the link for spam logs if the Askimet is disabledDouglas Barbosa Alexandre2016-02-022-6/+11
| | | | |
| * | | | Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-024-27/+18
| | | | |
| * | | | Use time_ago_with_tooltip on spam logs listDouglas Barbosa Alexandre2016-02-021-1/+1
| | | | |
| * | | | Fix typo on User modelDouglas Barbosa Alexandre2016-02-021-1/+1
| | | | |
| * | | | Use truncate helper on spam logs listDouglas Barbosa Alexandre2016-02-022-9/+1
| | | | |
| * | | | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-0211-4/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* | | | | Merge branch 'fix-tooltips-admin-nav' into 'master' Robert Speicher2016-02-031-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve tooltips on admin menu See merge request !2673
| * | | | | Improve tooltips on admin menuZeger-Jan van de Weg2016-02-021-3/+3
| | | | | |
* | | | | | Merge branch 'title-projects-dropdown' into 'master' Jacob Schatz2016-02-025-11/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added dropdown to list all projects on project header Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4212 When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user. When closed: ![Screen_Shot_2016-01-14_at_19.17.44](/uploads/a7258ba388dba238fc2f0468711fc729/Screen_Shot_2016-01-14_at_19.17.44.png) When open: ![Screen_Shot_2016-01-14_at_19.17.51](/uploads/716533d9eb44b123c5fdff36a4740489/Screen_Shot_2016-01-14_at_19.17.51.png) cc. @jschatz1 See merge request !2438
| * | | | | | added testsPhil Hughes2016-01-301-3/+6
| | | | | | |
| * | | | | | removed private method namingPhil Hughes2016-01-301-2/+2
| | | | | | |
| * | | | | | remove period from function callPhil Hughes2016-01-301-1/+1
| | | | | | |
| * | | | | | rubocop fixesPhil Hughes2016-01-301-3/+2
| | | | | | |
| * | | | | | removed un-used variablePhil Hughes2016-01-301-2/+0
| | | | | | |
| * | | | | | fixes issue when user is not logged in but viewing public projectPhil Hughes2016-01-301-4/+6
| | | | | | |
| * | | | | | selecting project in dropdown takes user to the correct projectPhil Hughes2016-01-301-0/+3
| | | | | | |
| * | | | | | uses AJAX to select the projectsPhil Hughes2016-01-305-44/+20
| | | | | | |
| * | | | | | pulls in all user projectsPhil Hughes2016-01-302-8/+13
| | | | | | |
| * | | | | | Added dropdown to list all projects on project headerPhil Hughes2016-01-302-5/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user
* | | | | | | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-024-20/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send raw Git blobs via gitlab-workhorse See merge request !2451
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer2016-02-027-9/+42
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Use @repositoryJacob Vosmaer2016-02-021-3/+2
| | | | | | | |
| * | | | | | | Avoid trailing 'charset=' garbageJacob Vosmaer2016-02-012-2/+4
| | | | | | | |