summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Fix corrupted binary files when using API files endpointStan Hu2015-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219
* | | | Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher2015-08-108-8/+32
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110
| * | | Add `data-[type]-id` attribute to reference linksrs-reference-data-attrsRobert Speicher2015-08-088-8/+32
| | | | | | | | | | | | | | | | This is to let us redact them later in another filter.
* | | | Merge branch 'bitbucket-show-incompatible' into 'master'Douwe Maan2015-08-071-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show incompatible projects in Bitbucket import status ### What does this MR do? This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table. ### Why was this MR needed? Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fa). ### Screenshot ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/264b080114c809c4a3a79580594af8b2/image.png) ### What are the relevant issue numbers? #1871 See merge request !1114
| * | | | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-0/+4
| |/ / / | | | | | | | | | | | | See #1871
* | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-08-0615-533/+141
|\ \ \ \ | |/ / /
| * | | Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-061-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
| | * | Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu2015-08-021-1/+1
| | | | | | | | | | | | | | | | Closes #1359
| * | | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-0510-520/+5
| |\ \ \
| | * \ \ Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-0424-118/+484
| | |\ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Fix merge api and specDmitriy Zaporozhets2015-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Huge refactoring for accepting merge requestsDmitriy Zaporozhets2015-07-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Fix application initializeDmitriy Zaporozhets2015-07-151-0/+4
| | | | | |
| | * | | | Remove satellitesDmitriy Zaporozhets2015-07-159-523/+0
| | | | | |
| * | | | | Merge branch 'rs-fix-rouge-inline-theme' into 'master' Stan Hu2015-08-041-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the `inline_theme` option for the Rouge formatter See merge request !1083
| | * | | | Fix the `inline_theme` option for the Rouge formatterrs-fix-rouge-inline-themeRobert Speicher2015-08-011-1/+1
| | | | | |
| * | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-08-0310-22/+173
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'api-useremails' into 'master' Robert Speicher2015-07-312-6/+121
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to manage user email addresses via the API. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2181 See merge request !1066
| | | * | | Fix indentationDouwe Maan2015-07-311-11/+11
| | | | | |
| | | * | | Merge branch 'master' into api-useremailsDouwe Maan2015-07-318-14/+42
| | | |\ \ \
| | | * | | | Add ability to manage user email addresses via the API.Douwe Maan2015-07-292-0/+115
| | | | | | |
| | * | | | | Fix multi-line syntax highlightingStan Hu2015-07-301-2/+10
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has the proper styling to fix this. Closes #1577
| * | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2015-07-2913-95/+300
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | backup-archive-permissions
| * | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2015-07-2713-30/+103
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | backup-archive-permissions
| * | | | | | Allow custom backup archive permissionsJacob Vosmaer2015-07-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change helps system administrators who want to replicate GitLab backup files without needing root permissions.
* | | | | | | Merge branch 'master' into comment-updated-byDouwe Maan2015-07-318-14/+42
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'rs-mr-1050-followup' into 'master' Robert Speicher2015-07-311-2/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add spec to RelativeLinkFilter for Unicode filenames Adds specs for changes added in !1050 See merge request !1078
| | * | | | | | Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-301-2/+11
| | | | | | | |
| * | | | | | | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-301-0/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add project star and fork count, group avatar URL and user/group web URL attributes to API Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521. See merge request !1058
| | * | | | | | No more web urlDouwe Maan2015-07-301-2/+10
| | | | | | | |
| | * | | | | | Merge branch 'master' into api-new-attributesDouwe Maan2015-07-297-12/+257
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Add project star and fork count, group avatar URL and user/group web URL ↵Douwe Maan2015-07-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attributes to API
| * | | | | | | Merge branch 'fix-image-file-is-not-displayed' into 'master'Robert Speicher2015-07-301-2/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update RelativeLinkFilter to support non-ASCII filenames See merge request !1050
| | * | | | | | | Fix the image file that contains non-ascii character is not displayedHiroyuki Sato2015-07-271-2/+3
| | | | | | | | |
| * | | | | | | | Merge branch 'backup-directory-permissions' into 'master' Stan Hu2015-07-304-6/+14
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backup directory permissions This sidesteps problems with running 'chmod' on some CIFS mounts. Closes #1704 https://gitlab.com/gitlab-org/gitlab-ce/issues/1704 See merge request !1065
| | * | | | | | | | 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.
| * | | | | | | | Merge branch 'fix-rake-check-hooks' into 'master'Jacob Vosmaer2015-07-301-4/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that hooks directory exists before attempting to call realpath This MR checks that the hooks directories actually exist before attempting to resolve their `realpath`. Users who attempted to restore from source to an omnibus installation would get ugly errors when running `gitlab-rake gitlab:check`: ``` Errno::ENOENT: No such file or directory @ realpath_rec - /var/opt/gitlab/git-data/repositories/Wanda/www.git/hooks /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `realpath' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `block in check_repos_hooks_directory_is_link' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block (2 levels) in find_each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block in find_each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:126:in `find_in_batches' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:51:in `find_each' /opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/querying.rb:9:in `find_each' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:482:in `check_repos_hooks_directory_is_link' /opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:343:in `block (3 levels) in <top (required)>' Tasks: TOP => gitlab:check => gitlab:gitlab_shell:check ``` Closes #2121 #2082 See merge request !1068
| | * | | | | | | | Check that hooks directory exists before attempting to call realpathStan Hu2015-07-301-4/+4
| | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Closes #2121
| * | | | | | | | Check that project was actually created rather than just validated in ↵Stan Hu2015-07-291-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | import:repos task Add gitlab-shell to error message to give user a clue that something may be wrong there. Ran into this in #2082. User was told that repositories were created when they were not due to hooks symlink being wrong.
* | | | | | | | Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-301-7/+5
|/ / / / / / /
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqValery Sizov2015-07-294-2/+70
|\ \ \ \ \ \ \
| * | | | | | | Fix style pointsGitLab2015-07-282-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make Rubocop and Douwe happy
| * | | | | | | Send GL_ID to gitlab-git-http-server as JSONGitLab2015-07-281-3/+4
| | | | | | | |
| * | | | | | | Handle missing @user during Git HTTP requestsGitLab2015-07-281-1/+10
| | | | | | | |
| * | | | | | | Experimental support for gitlab-git-http-serverJacob Vosmaer2015-07-284-2/+61
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-git-http-server This change introduces the GITLAB_GRACK_AUTH_ONLY environment variable. When set, Grack requests to GitLab will only respond with the user's GL_ID (if the request is OK) or an error. This allows gitlab-git-http-server to use the main GitLab application as an authentication and authorization backend. If we like how this works we should drop the GITLAB_GRACK_AUTH_ONLY variable at some point in the future.
* | | | | | | Merge pull request #9341 from rumpelsepp/rougeStan Hu2015-07-282-4/+172
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Switch back to rouge gem for synthax highlighting
| * | | | | | | Add HTMLGitlab formatterStefan Tatschner2015-07-291-0/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This custom formatter for rouge is needed to generate HTML output specifically for gitlab. Since its usecase is mostly suitable for gitlab it had been rejected upstream: https://github.com/jneen/rouge/pull/268 Thanks a lot to @stanhu, @jneen and @tsigo for review!
| * | | | | | | Replace Rugments with RougeStefan Tatschner2015-07-291-4/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have mainly created the rugments fork for the purpose of improving gitlab's highlighting. Nowadays IMO it works way better than the old highlight.js solution. But the development is stuck on my side because of a couple of personal reasons: * I have finished my studies; last months I was writing my master thesis. So there was a huge time problem. I am sorry for that. * I had to move to Munich due to getting a (paid) job. Searching a flat here is horrible... :) * Last but not least, maintaining the same code base in two seperate projects is a mess. I have decided to switch back to rouge due to several reasons: * In the beginning I was quite motivated, but since I start working on my new job next week, the best solution IMO is switching back to upstream rouge. * Rouge is continously improving: https://github.com/jneen/rouge/blob/master/CHANGELOG.md http://rouge.jneen.net/ * There should be absolutely no regressions with this change. Most likely this pull request will almost fix some minor bugs. * One less gem in gitlab is a good thing. since Gitlab is quite a huge bundle of gems. Reducing complexity should be a major milestone. Thanks a lot to @stanhu and @jneen for the review!
* | | | | | | Fix bug causing Bitbucket importer to crash when OAuth application had been ↵bitbucket-re-authorizeDouwe Maan2015-07-281-6/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | removed.