delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \|	Revert "Merge branch 'drop-satellites'"	Dmitriy Zaporozhets	2015-08-11	10	-5/+520
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'fix-diff-highlighting' into 'master'	Douwe Maan	2015-08-10	1	-20/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diff syntax highlighting ### What does this MR do? This MR fixes a syntax highlighting issue that that manifested itself when a user tried the following: ``` +aaa +bbb ccc ``` However, a regression in 0abe98f0 caused the last line to be put on the second to last line: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/a16515499d5e3fd9737370d89c73f671/image.png) Instead of this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/59eca6efd4c290aa633b9fb54c98a70e/image.png) This bug occurred because of some error in the logic of handling new lines in the content. Refactored HTML parser to avoid duplication of newline parsing. ### What are the relevant issue numbers? Closes #2235 See merge request !1126
\| * \| \| \|	Fix diff syntax highlighting	Stan Hu	2015-08-10	1	-20/+21
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactored HTML parser to avoid duplication of newline parsing. Closes #2235
* \| \| \|	Merge branch 'disable-autocrlf-for-binary-files' into 'master'	Stan Hu	2015-08-10	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix corrupted binary files when using API files endpoint Closes #2219 See merge request !1123
\| * \| \|	Fix corrupted binary files when using API files endpoint	Stan Hu	2015-08-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add CHANGELOG for gitlab_git 7.2.9 updates Closes #2219
* \| \| \|	Merge branch 'rs-reference-data-attrs' into 'master'	Robert Speicher	2015-08-10	8	-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-attrs	Robert Speicher	2015-08-08	8	-8/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to let us redact them later in another filter.
* \| \| \|	Merge branch 'bitbucket-show-incompatible' into 'master'	Douwe Maan	2015-08-07	1	-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 status	Stan Hu	2015-08-07	1	-0/+4
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	See #1871
* \| \| \|	Merge branch 'master' into comment-updated-by	Douwe Maan	2015-08-06	15	-533/+141
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'	Douwe Maan	2015-08-06	1	-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 slashes	Stan Hu	2015-08-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1359
\| * \| \|	Merge branch 'drop-satellites'	Dmitriy Zaporozhets	2015-08-05	10	-520/+5
\| \|\ \ \
\| \| * \ \	Merge branch 'master' into drop-satellites	Dmitriy Zaporozhets	2015-08-04	24	-118/+484
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Fix merge api and spec	Dmitriy Zaporozhets	2015-08-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Huge refactoring for accepting merge requests	Dmitriy Zaporozhets	2015-07-16	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Fix application initialize	Dmitriy Zaporozhets	2015-07-15	1	-0/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Remove satellites	Dmitriy Zaporozhets	2015-07-15	9	-523/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'rs-fix-rouge-inline-theme' into 'master'	Stan Hu	2015-08-04	1	-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-theme	Robert Speicher	2015-08-01	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-08-03	10	-22/+173
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge branch 'api-useremails' into 'master'	Robert Speicher	2015-07-31	2	-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 indentation	Douwe Maan	2015-07-31	1	-11/+11
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'master' into api-useremails	Douwe Maan	2015-07-31	8	-14/+42
\| \| \| \|\ \ \
\| \| \| * \| \| \|	Add ability to manage user email addresses via the API.	Douwe Maan	2015-07-29	2	-0/+115
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Fix multi-line syntax highlighting	Stan Hu	2015-07-30	1	-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 Vosmaer	2015-07-29	13	-95/+300
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \|	backup-archive-permissions
\| * \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵	Jacob Vosmaer	2015-07-27	13	-30/+103
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backup-archive-permissions
\| * \| \| \| \| \|	Allow custom backup archive permissions	Jacob Vosmaer	2015-07-06	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change helps system administrators who want to replicate GitLab backup files without needing root permissions.
* \| \| \| \| \| \|	Merge branch 'master' into comment-updated-by	Douwe Maan	2015-07-31	8	-14/+42
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'rs-mr-1050-followup' into 'master'	Robert Speicher	2015-07-31	1	-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 filenames	Robert Speicher	2015-07-30	1	-2/+11
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'api-new-attributes' into 'master'	Robert Speicher	2015-07-30	1	-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 url	Douwe Maan	2015-07-30	1	-2/+10
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' into api-new-attributes	Douwe Maan	2015-07-29	7	-12/+257
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Add project star and fork count, group avatar URL and user/group web URL ↵	Douwe Maan	2015-07-28	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	attributes to API
\| * \| \| \| \| \| \|	Merge branch 'fix-image-file-is-not-displayed' into 'master'	Robert Speicher	2015-07-30	1	-2/+3
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update RelativeLinkFilter to support non-ASCII filenames See merge request !1050
\| \| * \| \| \| \| \| \|	Fix the image file that contains non-ascii character is not displayed	Hiroyuki Sato	2015-07-27	1	-2/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'backup-directory-permissions' into 'master'	Stan Hu	2015-07-30	4	-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-permissions	Jacob Vosmaer	2015-07-30	3	-4/+14
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Set internal backup directory modes on create	Jacob Vosmaer	2015-07-29	4	-5/+3
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This sidesteps problems with running 'chmod' on some CIFS mounts.
\| * \| \| \| \| \| \| \|	Merge branch 'fix-rake-check-hooks' into 'master'	Jacob Vosmaer	2015-07-30	1	-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 realpath	Stan Hu	2015-07-30	1	-4/+4
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2121
\| * \| \| \| \| \| \| \|	Check that project was actually created rather than just validated in ↵	Stan Hu	2015-07-29	1	-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 author	Douwe Maan	2015-07-30	1	-7/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Valery Sizov	2015-07-29	4	-2/+70
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix style points	GitLab	2015-07-28	2	-8/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To make Rubocop and Douwe happy
\| * \| \| \| \| \| \|	Send GL_ID to gitlab-git-http-server as JSON	GitLab	2015-07-28	1	-3/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Handle missing @user during Git HTTP requests	GitLab	2015-07-28	1	-1/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Experimental support for gitlab-git-http-server	Jacob Vosmaer	2015-07-28	4	-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.