summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Mention required Ruby versionruby_versionAchilleas Pipinellis2016-01-202-6/+20
| | | | [ci skip]
* Update CHANGELOGRobert Speicher2016-01-191-5/+5
| | | | | | | - Add attribution for Anton Baklanov - Remove attributions for employees [ci skip]
* Merge branch 'add_email_headers' into 'master' Robert Speicher2016-01-196-9/+84
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-196-9/+84
| | | | | | | | Fixes #2098
* | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-199-27/+95
|\ \ | | | | | | | | | | | | | | | | | | | | | 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-1911-33/+94
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-199-27/+95
| | | |
* | | | Merge branch 'add-public-param-to-project-api' into 'master' Dmitriy Zaporozhets2016-01-196-0/+37
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add public params to GET /projects api. Closes #3788 See merge request !2409
| * | | | Add specs. Adjust filter.Josh Frye2016-01-192-1/+24
| | | | |
| * | | | Change 'public' flag to more robust 'visibility' query.Josh Frye2016-01-195-8/+12
| | | | |
| * | | | Update all docs for public paramJosh Frye2016-01-192-0/+4
| | | | |
| * | | | Add public params to GET /projects api. Closes #3788Josh Frye2016-01-193-0/+6
| |/ / /
* | | | 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-193-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-193-1/+3
| | | |
* | | | Merge branch 'improve-project-external-issue-trackers' into 'master' Douwe Maan2016-01-198-33/+92
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 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-198-33/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-196-12/+33
|\ \ \
| * | | Remove dropdown containing CI Lint button on builds pagefeature/expose-ci-lint-toolGrzegorz Bizon2016-01-183-12/+6
| | | | | | | | | | | | | | | | Link to CI Lint on builds page will be a separate button from now on.
| * | | Update build artifacts feature testsGrzegorz Bizon2016-01-171-6/+6
| | | |
| * | | Add Changelog entry for exposing CI Lint tool on builds pageGrzegorz Bizon2016-01-171-0/+1
| | | |
| * | | Add specs for CI Lint button exposed on a builds pageGrzegorz Bizon2016-01-173-5/+20
| | | |
| * | | 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-193-9/+71
|\ \ \ \ | |_|/ / |/| | |
| * | | This will ensure previous assignee gets an email even if his notif level is ↵fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-152-5/+44
| | | | | | | | | | | | | | | | "on mention"
| * | | Add changelog entry for fix-consider-re-assign-as-a-mentionRémy Coutable2016-01-151-0/+1
| | | |
| * | | Consider re-assign as a mention from a notification point of viewRémy Coutable2016-01-152-6/+28
| | | | | | | | | | | | | | | | | | | | This will ensure new assignee gets an email even if his notif level is "on mention".
* | | | Merge branch 'warning-pending-migrations' into 'master' Robert Speicher2016-01-193-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise an error on page load when there are pending migrations in development mode. Fixes #5990 See merge request !2491
| * | | | Raise an error on page load if there are pending migrations on dev envDouglas Barbosa Alexandre2016-01-191-0/+3
| | | | |
| * | | | Ensure that doesn't have pending migrations when running the specsDouglas Barbosa Alexandre2016-01-192-3/+2
| | | | |
* | | | | 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.
* | | | | | Merge branch 'sorting-dropdown-does-not-fit-filter-bar' into 'master' Dmitriy Zaporozhets2016-01-191-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce margin to fit dropdowns ![Screen_Shot_2016-01-18_at_7.51.23_PM](/uploads/03336f86fde25d6d045742297a19751c/Screen_Shot_2016-01-18_at_7.51.23_PM.png) Fixes #10747 See merge request !2492
| * | | | | Reduce margin to fit dropdownsJacob Schatz2016-01-181-1/+1
|/ / / / / | | | | | | | | | | | | | | | Fixes #10747
* | | | | Merge branch 'fix_changelog' into 'master' Robert Speicher2016-01-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move entry `Fix: As an admin, cannot add oneself as a member to a group/project` The CHANGELOG entry said it was fixed in 8.2.3. However, I found https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1942 that suggests it wasn't fixed until 8.3.0. A customer experienced this issue on 8.2.3, still. This ultimately led to me investigating this further. [ci skip] See merge request !2488
| * | | | | Move entry `Fix: As an admin, cannot add oneself as a member to a group/project`fix_changelogDrew Blessing2016-01-181-1/+1
| | | | | |
* | | | | | Merge branch 'fix/events-data-limit-for-mysql' into 'master' Robert Speicher2016-01-184-2/+27
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix limit for `data` column in `events` table when using MySQL Closes #9084 See merge request !2486
| * | | | | | Update MySQL docsRobert Speicher2016-01-183-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | Modify CHANGELOG entry [ci skip]Tomasz Maczukin2016-01-181-1/+1
| | | | | | |
View Lorry Controller Status