summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge branch 'fix-api-mr-notes-ordering' into 'master'Douwe Maan2015-07-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return comments in created order in merge request API Closes #1832 See merge request !985
| * | | | | | Return comments in created order in merge request APIStan Hu2015-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1832
* | | | | | | Merge branch 'rake-update-commit-count' into 'master'Valery Sizov2015-07-271-0/+20
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rake task 'gitlab:update_commit_count' Starting with migration `20150717130904` commit count is stored in the database. For existing projects it defaults to `0` and is updated to the correct value when commits are pushed. The newly introduced rake task updates the commit count for all projects which have not been updated yet. ![gitlab-rake-update-commit-count](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4785009e0f3fc4c3199fe65dfb8e60e0/gitlab-rake-update-commit-count.png) Refs !986, !989, #2040, #2089. See merge request !1040
| * | | | | | Add rake task 'gitlab:update_commit_count'Daniel Gerhardt2015-07-241-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with migration `20150717130904` commit count is stored in the database. For existing projects it defaults to `0` and is updated to the correct value when commits are pushed. The newly introduced rake task updates the commit count for all projects which have not been updated yet. Refs !986, !989, #2040.
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-07-241-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Gitlab Issue 707: Indent unfolded code 1 characterngentile2015-07-221-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'auth-icons-labels' into 'master' Valery Sizov2015-07-241-8/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow custom label to be set for authentication providers. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341 Beside the above, I've: - Refactored `OauthHelper` to have clearer method names and behaviour - Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider` - Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth - Updated the icons for GitHub and GitLab In the examples below, "OurAuth" is a SAML provider with a custom label. ![Screen_Shot_2015-07-02_at_16.29.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d425bde69dc34e1667ebd5375d0266d/Screen_Shot_2015-07-02_at_16.29.52.png) ![Screen_Shot_2015-07-02_at_16.31.40](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cbb273321ecdf4cab3d3ef0dc35553e7/Screen_Shot_2015-07-02_at_16.31.40.png) ![Screen_Shot_2015-07-02_at_16.32.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d8dd6e1d0dc45a788e869cdcdc99e178/Screen_Shot_2015-07-02_at_16.32.39.png) ![Screen_Shot_2015-07-02_at_16.33.18](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7dbfe8b0ae229c32a08d6c7442976d83/Screen_Shot_2015-07-02_at_16.33.18.png) See merge request !927
| * | | | | | Allow custom label to be set for authentication providers.auth-icons-labelsDouwe Maan2015-07-231-8/+20
| | | | | | |
* | | | | | | Merge branch 'changes_for_gmail_inbox_actions' into 'master' Douwe Maan2015-07-231-73/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes for gmail inbox actions Related to the ongoing efforts to get Gmail inbox actions for GitLab.com in #1517 Not using `mdash` would break the rendering of the html email by switching `Content-Transfer-Encoding` to `quoted-printable` for every email. Removed the rake task and docs to prevent users from sending dummy emails which might cause application rejection. See merge request !1024
| * | | | | | Remove docs and rake task for gmail actions to prevent problems with ↵changes_for_gmail_inbox_actionsMarin Jankovski2015-07-221-73/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | registration.
* | | | | | Fix Remove source-branch for MRs from same projectDouwe Maan2015-07-221-1/+1
|/ / / / /
* | | | | Don't stop if database.sql.gz already existsoverwrite-during-backupJacob Vosmaer2015-07-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing behavior of the backups is to overwrite whatever data was still there in the scratch directories. This broke when we added a 'gzip' step because 'gzip database.sql' will fail if 'database.sql.gz' already exists. Doing 'rm -f database.sql.gz' before the 'gzip' avoids this failure.
* | | | | Merge branch 'gc-images-no-casing' into 'master'Stan Hu2015-07-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GoogleCode importer: Do not care about casing of image file extensions When a GoogleCode repository contains an attached image with an UPPERCASE file extension, it's not inlined. /CC @DouweM See merge request !1003
| * | | | | GoogleCode importer: Do not care about casing of image file extensionsSven Strickroth2015-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | | Merge pull request #9400 from tuxillo/patch-1Jacob Vosmaer2015-07-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use whoami instead of $USER
| * | | | | Use whoami instead of $USERAntonio Huete Jimenez2015-06-191-1/+1
| | | | | | | | | | | | | | | | | | - Use whoami instead of relying on the existence of $USER enviroment variable which is not always present
* | | | | | Store commit count in project tableadvanced-cacheDmitriy Zaporozhets2015-07-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Build missing cache items in background job after each pushDmitriy Zaporozhets2015-07-171-0/+4
| |/ / / / |/| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'merge-request-wip-information' into 'master'Stan Hu2015-07-151-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | api: expose work_in_progress flag See merge request !948
| * | | | api: expose work_in_progress flagBen Boeckel2015-07-101-0/+1
| | | | |
* | | | | Fix transferring of project to another group using the API.Douwe Maan2015-07-111-2/+2
|/ / / /
* | | | Merge branch 'fork_visibility_level' into 'master'Dmitriy Zaporozhets2015-07-101-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forks should not have more permissive visibility levels than the original https://dev.gitlab.org/gitlab/gitlabhq/issues/2286 See merge request !936
| * | | | Fork visibility level fixfork_visibility_levelValery Sizov2015-07-061-0/+4
| | |/ / | |/| |
* | | | Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries"Stan Hu2015-07-091-3/+0
| | | | | | | | | | | | | | | | This reverts commit dd4fee5fdbda07fbc09234c4b043c3c9939a6a9b.
* | | | api: add 'system', 'upvote', and 'downvote' fields to note queriesBen Boeckel2015-07-091-0/+3
| | | |
* | | | Properly render plain readmeDmitriy Zaporozhets2015-07-091-0/+10
| |_|/ |/| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | use teaspoon instead of jasmine for testing javascriptFrancesco Coda Zabetta2015-07-081-1/+1
| | |
* | | Merge branch 'improve-postgres-restore-cleaning' into 'master' Dmitriy Zaporozhets2015-07-073-25/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use native Postgres database cleaning during backup restore We were using hacks to drop tables etc during a Postgres backup restore. With this change, we let pg_dump insert the DROP TABLE statements it needs at the start of the SQL dump. See merge request !1891
| * | | Use native Postgres database cleaning during backup restoreJacob Vosmaer2015-07-073-25/+2
| |/ / | | | | | | | | | | | | | | | We were using hacks to drop tables etc during a Postgres backup restore. With this change, we let pg_dump insert the DROP TABLE statements it needs at the start of the SQL dump.
* | | Merge branch 'compress-db' into 'master'Kamil Trzciński2015-07-071-0/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compress database backup Restore handles both cases: uncompressed and compressed backup. As an improvement `IO.popen` can be used. /cc @jacobvosmaer See merge request !873
| * | | Compress database backupKamil Trzcinski2015-07-061-0/+14
| |/ /
* | | Merge branch 'settings-via-api' into 'master'Dmitriy Zaporozhets2015-07-073-0/+58
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | API to set application settings for admin Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !934
| * | Add tests and improve logicDmitriy Zaporozhets2015-07-061-1/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Add docs and empty specs for applicaiton settings APIDmitriy Zaporozhets2015-07-061-2/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | API to set application settings for adminDmitriy Zaporozhets2015-07-033-0/+58
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #9430 from gitlabhq/fix-rake-test-ciDmitriy Zaporozhets2015-07-061-1/+1
|\ \ \ | | | | | | | | Use teaspoon instead of jasmine:ci
| * | | Use teaspoon instead of jasmine:ciDmitriy Zaporozhets2015-07-031-1/+1
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Allow user to be blocked and unblocked via the APISteve Norman2015-07-031-0/+30
|/ /
* | Extract the longest-matching ref from a commit path when multiple matches occurStan Hu2015-07-011-2/+6
| | | | | | | | Closes #1839
* | Reuse HTML Pipeline object in Markdown parserKamil Trzcinski2015-06-301-2/+2
| | | | | | | | The patches reduces pressure on GC and reduces markdown processing time
* | Merge branch '1791-fix-github-issue-order' into 'master'Stan Hu2015-06-291-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wrong order of issues when importing from github ### 1. What does this MR do? The order of issues imported from GitHub is fixed. ### 2. Are there points in the code the reviewer needs to double check? Nothing. ### 3. Why was this MR needed? The default behaviors of GitHub API at listing issues are sort: :created and direction: :desc. See GitHub API details at https://developer.github.com/v3/issues/#list-issues. ### 4. What are the relevant issue numbers / Feature requests? Fixes #1791 ### 5. Screenshots (if relevant) Nothing See merge request !898
| * | Fix wrong order of issues when importing from githubHiroyuki Sato2015-06-281-1/+3
| | | | | | | | | | | | | | | See API details at https://developer.github.com/v3/issues/. Refs #1791
* | | Remove jasmine:ci task, execute teaspoon directly on CIrs-update-gitlab-ciRobert Speicher2015-06-281-12/+0
|/ /
* | Merge branch 'rename-abilities' into 'master'Dmitriy Zaporozhets2015-06-264-7/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename abilities to correspond contoller/model action names write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code ``` def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end ``` See merge request !896
| * | Rename abilities to correspond contoller/model action namesrename-abilitiesDmitriy Zaporozhets2015-06-264-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Only people who can manage issue can assign labels to itpermission-improvementsDmitriy Zaporozhets2015-06-261-1/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add 2FA status to user admin APIStan Hu2015-06-231-0/+1
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9391
* | Merge branch 'split-tests' into 'master'Dmitriy Zaporozhets2015-06-2321-65/+61
|\ \ | | | | | | | | | | | | | | | | | | | | | Split rspec and spinach tests in parallel For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386 See merge request !874
| * | Replace GITLAB with GitLab in rake task descriptionsDmitriy Zaporozhets2015-06-2319-37/+37
| | |
| * | Refactor rake tasks for testsDmitriy Zaporozhets2015-06-232-28/+24
| | |