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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching	Douwe Maan	2015-12-10	351	-873/+2656
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # spec/lib/gitlab/markdown/autolink_filter_spec.rb # spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb # spec/lib/gitlab/markdown/commit_reference_filter_spec.rb # spec/lib/gitlab/markdown/cross_project_reference_spec.rb # spec/lib/gitlab/markdown/emoji_filter_spec.rb # spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/external_link_filter_spec.rb # spec/lib/gitlab/markdown/issue_reference_filter_spec.rb # spec/lib/gitlab/markdown/label_reference_filter_spec.rb # spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb # spec/lib/gitlab/markdown/redactor_filter_spec.rb # spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb # spec/lib/gitlab/markdown/relative_link_filter_spec.rb # spec/lib/gitlab/markdown/sanitization_filter_spec.rb # spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb # spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb # spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb # spec/lib/gitlab/markdown/task_list_filter_spec.rb # spec/lib/gitlab/markdown/upload_link_filter_spec.rb # spec/lib/gitlab/markdown/user_reference_filter_spec.rb
\| *	Merge branch 'rs-reset-db' into 'master'	Kamil Trzciński	2015-12-10	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run db:reset before db:create on CI Should prevent build failures caused by missing migrations, such as https://gitlab.com/gitlab-org/gitlab-ce/builds/439927 See merge request !2045
\| \| *	Run db:reset before db:create on CIrs-reset-db	Robert Speicher	2015-12-09	1	-1/+1
\| \| \|
\| * \|	Merge branch 'devise_paranoid_mode' into 'master'	Robert Speicher	2015-12-10	5	-17/+21
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Devise paranoid mode and ensure the returned message is the same every time. This will prevent user enumeration (low impact). Prior to this change a user could type an email in the password reset field and if the email didn't exist it returned an error. If the email was valid it returned a message saying the forgot password link had been emailed. After this change the user will receive a message that if the email is in our database the reset link will be emailed. I also changed the throttle mechanism so it still works the same but now returns the exact same message as above. Previously it would say 'You've already sent a request. Wait a few minutes'. This also allows user enumeration, although it requires a double-check. Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2624 See merge request !2044
\| \| * \|	Use devise paranoid mode and ensure the same message is returned every time	Drew Blessing	2015-12-09	5	-17/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
\| * \| \|	Merge branch 'ui-fix' into 'master'	Dmitriy Zaporozhets	2015-12-10	1	-19/+25
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix list with controls display Introduced in !2025 ## Before ![before](/uploads/969f021f1f97062439cc4e836f29bdf6/before.png) ## After ![after](/uploads/defd46ddbd8392625848dfd3ac067869/after.png) Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2048
\| \| * \| \|	Fix list with controls display	Dmitriy Zaporozhets	2015-12-10	1	-19/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-message	Dmitriy Zaporozhets	2015-12-10	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Fix inconsistency with no ssh key message
\| \| * \| \|	"No ssh" message should be same on project page	Andrew Tomaka	2015-12-09	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2015-12-09	1	-1/+1
\| \|\ \ \ \
\| \| * \ \ \	Merge branch 'yaml_safe_load' into 'master'	Robert Speicher	2015-12-09	1	-1/+1
\| \| \|\ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use YAML.safe_load See merge request !1941
\| \| * \| \| \|	Allow [Symbol] when loading YAML	Kamil Trzciński	2015-12-09	1	-2/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Use YAML.safe_load	Kamil Trzciński	2015-12-09	1	-2/+2
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'issue_3854' into 'master'	Dmitriy Zaporozhets	2015-12-09	1	-2/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Downcase commit author email for matching with users Closes #3854 See merge request !1992
\| \| * \| \| \|	Normalize email when looking for GitLab users from commit info. #3854issue_3854	Rubén Dávila	2015-12-09	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'move-network'	Dmitriy Zaporozhets	2015-12-09	8	-20/+29
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Fix test for network shortcutmove-network	Dmitriy Zaporozhets	2015-12-09	3	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	remove unnecessary code	Dmitriy Zaporozhets	2015-12-09	1	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \|	Move Network page from separate tab to sub tab of Commits	Dmitriy Zaporozhets	2015-12-09	8	-19/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Merge branch 'rs-delimit-build-counts' into 'master'	Dmitriy Zaporozhets	2015-12-09	1	-3/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add number_with_delimiter to build counts See merge request !2046
\| \| * \| \| \| \| \|	Add number_with_delimiter to build countsrs-delimit-build-counts	Robert Speicher	2015-12-09	1	-3/+6
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix-migrations' into 'master'	Dmitriy Zaporozhets	2015-12-09	3	-40/+51
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix migrations for postgres on test environment Make `be rake db:migrate:reset RAILS_ENV=test` work Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2002
\| \| * \| \| \| \| \|	Use up and down	Douwe Maan	2015-12-09	1	-1/+5
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix migrations for postgres on test environment	Dmitriy Zaporozhets	2015-12-07	3	-39/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/mr-broken'	Dmitriy Zaporozhets	2015-12-09	8	-32/+66
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Fix specsmr-broken	Douwe Maan	2015-12-08	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix specs	Douwe Maan	2015-12-08	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' into mr-broken	Douwe Maan	2015-12-08	78	-259/+953
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/helpers/ci_status_helper.rb
\| \| * \| \| \| \| \| \|	Use "Build passed" in tooltip instead of "Build status: passed"	Douwe Maan	2015-12-08	3	-3/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add indication to merge request list item that MR cannot be merged automatically	Douwe Maan	2015-12-08	4	-27/+61
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update CHANGELOG	Robert Speicher	2015-12-09	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Merge branch 'fix-typos' into 'master'	Robert Speicher	2015-12-09	7	-7/+7
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos in integration docs [ci skip] See merge request !1999
\| \| * \| \| \| \| \| \|	Fix typos in integration docs	Tobias Stöckler	2015-12-07	7	-7/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Robert Speicher	2015-12-09	1	-2/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update init script only once The init script is already being updated in section 6. See merge request !2038 [ci skip]
\| \| * \| \| \| \| \| \| \|	Update init script only once	Felix Eckhofer	2015-12-09	1	-2/+1
\| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The init script is already being updated in section 6.
\| * \| \| \| \| \| \| \|	Merge branch 'rs-default-clone-fixes' into 'master'	Robert Speicher	2015-12-09	2	-2/+3
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify shared User SSH key steps See merge request !2043
\| \| * \| \| \| \| \| \| \|	Simplify shared User SSH key steps	Robert Speicher	2015-12-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add CHANGELOG entry for !1998	Robert Speicher	2015-12-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Merge branch 'split-up-builds' into 'master'	Dmitriy Zaporozhets	2015-12-09	211	-202/+289
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization See merge request !2036
\| \| * \| \| \| \| \| \| \| \|	Make sure everyone has shared/lfs-objectssplit-up-builds	Douwe Maan	2015-12-09	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' into split-up-builds	Douwe Maan	2015-12-09	50	-273/+1626
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Split up spec:other even more	Douwe Maan	2015-12-09	2	-1/+33
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Tag service specs	Douwe Maan	2015-12-09	41	-41/+41
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Tag lib specs	Douwe Maan	2015-12-09	85	-86/+86
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix rspec tag syntax	Douwe Maan	2015-12-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Split up specs more	Douwe Maan	2015-12-09	2	-2/+18
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Tag model specs	Douwe Maan	2015-12-09	68	-68/+68
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Split up feature specs more	Douwe Maan	2015-12-09	2	-5/+32
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Tag feature specs	Douwe Maan	2015-12-09	13	-1/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'remove-default-branch-option-from-doc' into 'master'	Dmitriy Zaporozhets	2015-12-09	1	-1/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove default_branch from project API creation documentation The docs erroneously included `default_branch` as an option in project creation, but this field does not make sense because a new project has an empty repo with no branches. Closes #3937 See merge request !2034