summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | Fixes tooltip doesn't duplicate the "me" name.Jacob Schatz2016-01-181-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checks that "me" is not in the array of names in tooltip
| * | | | | | | | | | | | | | | Merge branch 'secret-shortcut-feature' into 'master' Dmitriy Zaporozhets2016-01-206-7/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "t" as a shortcut for find file anywhere See merge request !2507
| | * | | | | | | | | | | | | | | Simplifies the HAML if statement for project branch URLJacob Schatz2016-01-201-6/+2
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix HTML so code passessecret-shortcut-featureJacob Schatz2016-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code was failing because branch was named `'test'` with quotes which was escaping the javascript I was using.
| | * | | | | | | | | | | | | | | Fixes test to not search whole page for content.Jacob Schatz2016-01-201-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix project find url so branch ref is not nilJacob Schatz2016-01-192-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds autocomplete="off" to find input.
| | * | | | | | | | | | | | | | | Proper spacing in HAML file `if` statement.Jacob Schatz2016-01-191-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Removes `defined?` in favor to just `if`Jacob Schatz2016-01-191-1/+1
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Add reference to the correct branch.Jacob Schatz2016-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes `@ref` will be `nil`. this makes sure that the correct branch is passed in.
| | * | | | | | | | | | | | | | | Adds `t` as a shortcut for find file anywhereJacob Schatz2016-01-194-5/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-01-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed invalid JSON in first JSON Example Just a comma missing See merge request !2487
| | * | | | | | | | | | | | | | | Fixed invalid JSON in first JSON Example line 27Ruben Schmidt2016-01-181-1/+1
| | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'issue_3749' into 'master' Douwe Maan2016-01-207-5/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Issues/MRs updated_at field when notes are generated Closes #3749 and #9130 See merge request !2493
| | * | | | | | | | | | | | | | Fix broken specs.issue_3749Rubén Dávila2016-01-191-4/+8
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Update Issue/MR everytime a Note is saved/destroyed.Rubén Dávila2016-01-192-5/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Check if object respond to #touch before update.Rubén Dávila2016-01-181-1/+2
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Update Issues/MRs updated_at when user leaves comments.Rubén Dávila2016-01-186-1/+50
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'ci/artifacts-remove-compressed-size' into 'master' Douwe Maan2016-01-203-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `Compressed to` column from build artifacts browser See #10982. See merge request !2509
| | * | | | | | | | | | | | | | Remove `Compressed to` column from build artifacts browserci/artifacts-remove-compressed-sizeGrzegorz Bizon2016-01-203-4/+0
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #10982.
| | | | | | | | | * | | | | | Replaced user recommendation with link to git-gc documentationhousekeeping-docJeroen Nijhof2016-01-131-1/+1
| | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | Add housekeeping feature documentationJeroen Nijhof2016-01-112-0/+14
| | | | | | | | | | | | | | |
| | | | | | | | | | | * | | | Merge branch 'master' into doc_refactor_commits_apidoc_refactor_commits_apiAchilleas Pipinellis2016-01-1928-53/+207
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | * | | | | Styleguide the commit status APIAchilleas Pipinellis2016-01-191-75/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| | | | | | | | | | | * | | | | Refactor commits API documentationAchilleas Pipinellis2016-01-181-17/+57
| | | | | | | | | | | | |_|/ / | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | | WIP lazy blobsJacob Vosmaer2016-02-015-3/+15
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-01-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fixed minor typo in workflow documentation This change is self-explanatory. See merge request !2503
| * | | | | | | | | | | | | Fixed typoJohn Galt2016-01-191-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | 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