summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Add syntax highlighting to diff view. #3945Rubén Dávila2015-12-284-9/+40
| | | | | | | | |
* | | | | | | | | WIP lazy blobsJacob Vosmaer2016-02-014-1/+11
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'add_email_headers' into 'master' Robert Speicher2016-01-193-7/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added X-GitLab-... headers to emails from CI and Email On Push services Fixes #2098 This adds the 'X-GitLab-Project', 'X-GitLab-Project-Id' and 'X-GitLab-Project-Path' headers to emails from CI and Email On Push in a way that it is done currently for merge requests and issues emails. Additionally, CI emails will have 'X-GitLab-Build-Status' header with either 'fail' or 'success'. Emails from Email On Push will include 'X-Gitlab-Author' header containing the username of user who did the push. See merge request !2159
| * | | | | | | | Added X-GitLab-... headers to emails from CI and Email On Push servicesAnton Baklanov2016-01-193-7/+27
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes #2098
* | | | | | | | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-192-3/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow LDAP users to change their email if it was not set by the LDAP server Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3054 See merge request !2502
| * \ \ \ \ \ \ \ Merge branch 'master' into user-ldap-emailDouwe Maan2016-01-196-21/+17
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-192-3/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'add-public-param-to-project-api' into 'master' Dmitriy Zaporozhets2016-01-191-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add public params to GET /projects api. Closes #3788 See merge request !2409
| * | | | | | | | Add specs. Adjust filter.Josh Frye2016-01-191-1/+1
| | | | | | | | |
| * | | | | | | | Change 'public' flag to more robust 'visibility' query.Josh Frye2016-01-191-0/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'star-button-fork-count-increase' into 'master' Dmitriy Zaporozhets2016-01-191-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starring project only increases star count This is instead of increasing star & fork count Fixes #11396 ![star-count](/uploads/9a1d569393bc051d1a019f0340eec957/star-count.gif) cc. @jschatz1 See merge request !2504
| * | | | | | | when starring a project it correctly increase the star countPhil Hughes2016-01-191-2/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is instead of increasing star & fork count Fixed #11396
* | | | | | | Merge branch 'display-message-when-assignee-cannot-merge' into 'master' Dmitriy Zaporozhets2016-01-193-0/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds exclamation point when assigned user cannot merge Fixes: #4175 See merge request !2408
| * | | | | | Move multiple css rules to multiple lines.display-message-when-assignee-cannot-mergeJacob Schatz2016-01-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes extra line breaks.
| * | | | | | Fix spacing issues, fix naming inconsistencies. Fix conflicts.Jacob Schatz2016-01-182-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Used `issuable` instead
| * | | | | | color variable for error for exclamation pointJacob Schatz2016-01-182-2/+4
| | | | | | |
| * | | | | | adds exclamation point when assigned user cannot mergeJacob Schatz2016-01-182-0/+8
| | | | | | |
* | | | | | | Merge branch 'fix-project-creation' into 'master' Douwe Maan2016-01-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creator should be added as a master of the project on creation Fixes: #4222 See merge request !2463
| * | | | | | | Fix creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-191-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'improve-project-external-issue-trackers' into 'master' Douwe Maan2016-01-195-20/+16
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Greatly improve external_issue_tracker performance See 3d41133d48f6522b8755bb91b804864e8e520871 for all the details. As an aside, this commit contains a set of migrations that will introduce downtime as they add a column with a default value which in turn locks the entire table (at least on PostgreSQL). See merge request !2498
| * | | | | | | Greatly improve external_issue_tracker performanceimprove-project-external-issue-trackersYorick Peterse2016-01-195-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This greatly improves the performance of Project#external_issue_tracker by moving most of the fields queried in Ruby to the database and letting the database handle all logic. Prior to this change the process of finding an external issue tracker was along the lines of the following: 1. Load all project services into memory. 2. Reduce the list to only services where "issue_tracker?" returns true 3. Reduce the list from step 2 to service where "default?" returns false 4. Find the first service where "activated?" returns true This has to two big problems: 1. Loading all services into memory only to reduce the list down to a single item later on is a waste of memory (and slow timing wise). 2. Calling Array#select followed by Array#reject followed by Array#find allocates extra objects when this really isn't needed. To work around this the following service fields have been moved to the database (instead of being hardcoded): * category * default This in turn means we can get the external issue tracker using the following query: SELECT * FROM services WHERE active IS TRUE AND default IS FALSE AND category = 'issue_tracker' AND project_id = XXX LIMIT 1 This coupled with memoizing the result (just as before this commit) greatly reduces the time it takes for Project#external_issue_tracker to complete. The exact reduction depends on one's environment, but locally the execution time is reduced from roughly 230 ms to only 2 ms (= a reduction of almost 180x). Fixes gitlab-org/gitlab-ce#10771
* | | | | | | | Merge branch 'fix/artifacts-double-propagation' into 'master' Grzegorz Bizon2016-01-191-1/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double request issue in artifacts browser This fixed problem with double propagation when clicking a link that lies inside tr with clicked event attached. See merge request !2496
| * | | | | | | Fix double request issue in artifacts browserGrzegorz Bizon2016-01-191-1/+5
| |/ / / / / /
* | | | | | | Merge branch 'feature/expose-ci-lint-tool'Douwe Maan2016-01-191-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Remove dropdown containing CI Lint button on builds pagefeature/expose-ci-lint-toolGrzegorz Bizon2016-01-181-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to CI Lint on builds page will be a separate button from now on.
| * | | | | | | Reuse existing CSS classes when exposing CI Lint toolGrzegorz Bizon2016-01-171-10/+9
| | | | | | | |
| * | | | | | | Expose link to CI Lint Tool on builds pageGrzegorz Bizon2016-01-171-1/+13
| | | | | | | |
* | | | | | | | Merge branch 'fix-consider-re-assign-as-a-mention'Douwe Maan2016-01-191-8/+13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | This will ensure previous assignee gets an email even if his notif level is ↵fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-151-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "on mention"
| * | | | | | | Consider re-assign as a mention from a notification point of viewRémy Coutable2016-01-151-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will ensure new assignee gets an email even if his notif level is "on mention".
* | | | | | | | Merge branch 'browse-issues-incorrect-positioning-in-firefox-on-commit-page' ↵Dmitriy Zaporozhets2016-01-191-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix positioning issues with browse files button Issue is that in Firefox clipboard is blocking the browse files from moving all the way to the right. Move clipboard up 1px into -1px to unblock "browse files" SS from firefox: ![Screen_Shot_2016-01-18_at_4.01.58_PM](/uploads/312a5f1e55ca707081f718e2413416fb/Screen_Shot_2016-01-18_at_4.01.58_PM.png) Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/10849 See merge request !2489
| * | | | | | | | Fix positioning issues with browse files buttonbrowse-issues-incorrect-positioning-in-firefox-on-commit-pageJacob Schatz2016-01-181-0/+4
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue is that in Firefox clipboard is blocking the browse files from moving all the way to the right. Move clipboard up 1px into -1px to unblock browse files
* | | | | | | | Merge branch 'search-title-clipped' into 'master' Dmitriy Zaporozhets2016-01-191-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search title gets clipped vertically. Fixed by adding height to search title css. **Before:** ![Screen_Shot_2016-01-16_at_10.12.14_AM](/uploads/2651de6ae38251e1f20acade0c69a629/Screen_Shot_2016-01-16_at_10.12.14_AM.png) **After:** ![Screen_Shot_2016-01-16_at_10.12.05_AM](/uploads/6852e9a653bde1975d7fdfa4dbc302d8/Screen_Shot_2016-01-16_at_10.12.05_AM.png) See merge request !2460
| * | | | | | | | Search title was getting clipped horizontally.search-title-clippedJacob Schatz2016-01-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed by adding height to search title css.
* | | | | | | | | Reduce margin to fit dropdownsJacob Schatz2016-01-181-1/+1
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #10747
* | | | | | | | Improve ux in builds artifacts browserGrzegorz Bizon2016-01-183-18/+24
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'remove-leading-comma-award-emoji' into 'master' Robert Speicher2016-01-181-4/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove leading comma when user is the only one to award that emoji Fixes #9073 See merge request !2450
| * | | | | | Remove leading comma when user is the only one to award that emojiZeger-Jan van de Weg2016-01-171-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #9073
* | | | | | | Merge branch 'issuable-group-projects' into 'master' Yorick Peterse2016-01-181-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | See merge request !2481
| * | | | | | | Scope issue projects to a Group when possibleissuable-group-projectsYorick Peterse2016-01-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using IssuableFinder with a Group we can greatly reduce the amount of projects operated on (due to not including all public/internal projects) by simply passing it down to the ProjectsFinder class. This reduces the timings of the involved queries from roughly 300 ms to roughly 20 ms. Fixes gitlab-org/gitlab-ce#4071, gitlab-org/gitlab-ce#3707
* | | | | | | | Replaced "td" with "th" in the Sherlock SQL listsherlock-table-htmlYorick Peterse2016-01-181-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'margin-update' into 'master' Jacob Schatz2016-01-181-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update old ![Screenshot_2016-01-14_22.46.52](/uploads/d165897a6118c4b276e6b53982077cb5/Screenshot_2016-01-14_22.46.52.png) new ![Screenshot_2016-01-14_22.46.21](/uploads/6b34cd8b1a2799506676103fcbc80450/Screenshot_2016-01-14_22.46.21.png) See merge request !2441
| * | | | | | | updatemargin-updateAndriy Dyadyura2016-01-141-1/+1
| | | | | | | |
| * | | | | | | updateAndriy Dyadyura2016-01-141-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'hook_url_limit' into 'master' Dmitriy Zaporozhets2016-01-184-8/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise hook url limit 1. Up varchar url limit to 2000 chars instead 255 2. Maybe migration? 3. 255 characters - it is not enough 4. nil 5. nil See merge request !1940
| * | | | | | | | Raise hook url limitKirilll Zaycev2016-01-154-8/+8
| |/ / / / / / /
* | | | | | | | Merge branch 'diff-white-line-fix' into 'master' Jacob Schatz2016-01-181-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes white line when hiding diff comments in MR Fixes #6071 See merge request !2407
| * | | | | | | | Removes white line when hiding diff comments in MRPhil Hughes2016-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #6071
* | | | | | | | | Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into ↵Dmitriy Zaporozhets2016-01-181-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fixes issue where firefox does not delete message after comment submit Issue was **not** in the way comment was being submitted. `app/assets/javascripts/awards_handler.coffee` was throwing an error. This error was preventing any js from running after it. Fixes #1473 See merge request !2452
| * | | | | | | | | Fixes issue where firefox does not delete message after comment submitcomment-text-remains-in-text-box-after-submitting-itJacob Schatz2016-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue was **not** in the way comment was being submitted. `app/assets/javascripts/awards_handler.coffee` was throwing an error. This error was preventing any js from running after it. Fixes #1473