summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| | | | |
| * | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-01236-911/+1516
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git-raw-workhorse
| * | | | | Use only one header to send git blobsJacob Vosmaer2016-02-012-4/+2
| | | | | |
| * | | | | No need for base64 anymoreJacob Vosmaer2016-01-281-2/+0
| | | | | |
| * | | | | Send more raw blob data with workhorseJacob Vosmaer2016-01-282-8/+7
| | | | | |
| * | | | | Use less memory while counting linesJacob Vosmaer2016-01-281-1/+1
| | | | | |
| * | | | | Use a /raw/ request to show an imageJacob Vosmaer2016-01-201-1/+1
| | | | | |
| * | | | | Prototype of Git blobs via workhorseJacob Vosmaer2016-01-151-11/+6
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobsJacob Vosmaer2016-02-027-9/+42
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'generate-valid-message-id-for-email-rejections' into 'master' Douwe Maan2016-02-021-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate valid (RFC 2111) Message-ID in email rejection mailer Use a Message-ID that is RFC 2111 compliant. This fix is consistent with how the Message-ID is generated in the 'notify' mailer. See merge request !2656
| | * | | | Generate valid Message-ID in email rejection mailerWarren Guy2016-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a Message-ID that is RFC 2111 compliant. This fix is consistent with how the Message-ID is generated in the 'notify' mailer.
| * | | | | Allow manual resize of js-autosize textareasrs-relax-autosizeRobert Speicher2016-02-013-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First, the autosize library was being too controlling and removed the `resize` property from any elements to which it was attached, removing the drag handle. Second, we detect when the user manually resizes an autosize textarea, and then remove the autosize behavior from it and increase its max-height. This should allow for the best of both worlds. Closes #12832
| * | | | | Merge branch 'merge-request-closes-issues-performance' into 'master'Robert Speicher2016-02-011-4/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize fetching issues closed by a merge request Related issue: #12419 See merge request !2625
| | * | | | | Optimize fetching issues closed by a merge requestmerge-request-closes-issues-performanceYorick Peterse2016-02-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of running ClosingIssueExtractor for every commit in a merge request we can gather all the commit messages (and the merge request description), concatenate all this together and then run ClosingIssueExtractor only once. The result of this is that MergeRequest#closes_issues is now between 3.5x and 4x faster than the old setup. Using a merge request with 10 commits (each referencing a number of issues to close) this reduced the call duration from around 200 milliseconds to around 50 milliseconds. As a result of these changes the Jira related tests for MergeRequest#closes_issues have been removed. These tests stubbed Commit#closes_issues meaning that the only code that was really tested was the call to Array#uniq to filter out duplicate issues. As this code is no longer used (nor present) the corresponding tests were removed. Related: gitlab-org/gitlab-ce#12419
| * | | | | | Render sanitized SVG imagesStan Hu2016-02-012-1/+16
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265
* | | | | | Use begin/end instead of defined?Jacob Vosmaer2016-02-021-5/+5
| | | | | |
* | | | | | Move load command into _text partialJacob Vosmaer2016-02-022-1/+1
| | | | | |
* | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-01196-825/+1324
|\ \ \ \ \ \ | |/ / / / /
View Lorry Controller Status