summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Stricter mkdir's in 'rake gitlab:backup:create'backup-directory-permissionsJacob Vosmaer2015-07-303-4/+14
|
* Set internal backup directory modes on createJacob Vosmaer2015-07-294-5/+3
| | | | This sidesteps problems with running 'chmod' on some CIFS mounts.
* 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
| | |
* | | Merge branch 'fix-diff-patch-public-mr' into 'master'Dmitriy Zaporozhets2015-06-232-3/+7
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix downloading of patches on public merge requests when user logged out ### What does this MR do? This MR makes it possible to download a diff patch on a public merge request when a user is logged out. ### Why was this MR needed? An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button: ``` NoMethodError - undefined method `id' for nil:NilClass: lib/gitlab/backend/shell_env.rb:9:in `set_env' lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite' lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite' app/models/merge_request.rb:219:in `to_diff' app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show' ``` ### What are the relevant issue numbers? * Closes #1225 * Closes #1854 (dup) * Closes #1858 (dup) See merge request !872
| * | Fix downloading of patches on public merge requests when user logged outStan Hu2015-06-232-3/+7
| | | | | | | | | | | | | | | | | | Closes #1225 Closes #1854 Closes #1858
* | | Merge branch 'admin-edit-identities' into 'master'Dmitriy Zaporozhets2015-06-231-0/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Admin can see, edit and remove user identities Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !843
| * \ \ Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-223-1/+9
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/admin/users/show.html.haml
| * | | Make provider a select for identities form in admin areaDmitriy Zaporozhets2015-06-221-0/+19
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix error when deleting a user who has projectsStan Hu2015-06-231-1/+1
| |/ |/| | | | | | | Closes #1856 Closes https://github.com/gitlabhq/gitlabhq/issues/9394
* | Merge branch 'nginx_defaulthost_documentation' into 'master'Dmitriy Zaporozhets2015-06-222-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close #178 Nginx conf default_host documentation This closes #178 We're just making it clear that some nginx installs such as by default on recent Ubuntu's, the /etc/nginx/sites-enabled/default file will conflict the listen line of the gitlab nginx conf's due to the default_server directive. changed installation.md to identify the issue to a user added notes to both nginx configs for gitlab and gitlab-ssl [ci-skip See merge request !225
| * | fixed typoLuke Ashe-Browne2014-12-031-2/+2
| | |
| * | adding notes to gitlab nginx confLuke Ashe-Browne2014-12-032-1/+9
| | | | | | | | | | | | | | | We want to make users aware that the nginx default config will conflict with the gitlab default_server conf file.
View Lorry Controller Status