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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix autocomplete for new issues/MRs/snippetsfix-autocomplete-new-issues	Yorick Peterse	2016-01-15	3	-2/+3
\|
*	Merge branch ↵	Robert Speicher	2016-01-15	1	-4/+5
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'deleting-a-note-after-editing-another-results-in-a-javascript-error' into 'master' Fix javascript error with deleting messages in issue or merge request Elements searched for by jQuery no longer existed in the DOM. Javascript was also unnecessarily complex, for using jQuery Fixes #8109 See merge request !2442
\| *	Fix javascript error with deleting messages in issue or merge requestdeleting-a-note-after-editing-another-results-in-a-javascript-error	Jacob Schatz	2016-01-14	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Elements searched for by jQuery no longer existed in the DOM. Javascript was also unnecessarily complex, for using jQuery Fixes #8109
* \|	Update CHANGELOG	Robert Speicher	2016-01-14	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Moving 8.5 change to 8.4 since we're merging master into stable for now. [ci skip]
* \|	Merge branch 'rs-woff2' into 'master'	Robert Speicher	2016-01-14	13	-4/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prefer custom WOFF2 fonts if the browser supports them [ci skip] See merge request !2443
\| * \|	Prefer custom WOFF2 fonts if the browser supports them	Robert Speicher	2016-01-14	13	-4/+20
\|/ / \| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'ci/api-triggers' into 'master'	Kamil Trzciński	2016-01-14	8	-6/+326
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Add triggers API References #4264 See merge request !2286
\| *	Update CHANGELOGci/api-triggers	Tomasz Maczukin	2016-01-14	1	-2/+1
\| \|
\| *	Merge branch 'master' into ci/api-triggers	Tomasz Maczukin	2016-01-14	217	-1063/+3225
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (150 commits) fixes margin and padding Update mailroom/postfix documentation [ci skip] Fix css mess around git clone panel. Align it properly Fix missing padding for user/group pages Fix parse_gollum_tags matcher Update documentation on Banzai::Filter::GollumTagsFilter Add tests for the wiki pipeline Refactoring Banzai::Filter::GollumTagsFilter Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter Remove GollumTagsPipeline Refactoring Gitlab::GithubImport::Importer Remove unnecessary brackets on WIKI_SLUG_ID route constraints Move js function to removing accents to vendor/assets/javascripts Update CHANGELOG Use the WikiPipeline when rendering the wiki markdown content Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML Relax constraints for wiki slug Import GitHub wiki into GitLab Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus Revert changes to how the notes are paginated in the API ... Conflicts: doc/api/README.md lib/api/entities.rb
\| * \|	Modify entry in CHANGELOG	Tomasz Maczukin	2016-01-14	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' into ci/api-triggers	Tomasz Maczukin	2016-01-14	20	-10/+463
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: Fix version Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages Update CHANGELOG [ci skip] Add some cosmetic changes to variables API documentation [ci skip] Modify builds API documentation style [ci skip] Modify :ci_variable factory Add 'Build' prefix to Variables entry name in API docs index Fix some typos Add some fixes after review Remove blank line Update ./doc/api Change :variable_id to :key as resource ID in API Fix a typo in method description Add create feature to variables API Add missing 'not_found' checks in variables API Add delete feature to variables API Add update feature for variables API Add features for list and show details of variables in API Conflicts: doc/api/README.md lib/api/entities.rb
\| * \| \|	Fix version	Tomasz Maczukin	2016-01-14	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' into ci/api-triggers	Tomasz Maczukin	2016-01-14	54	-230/+931
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (32 commits) Fix specs and rubocop warnings fixed LDAP activation on login to use new ldap_blocked state Fix Admin/Users view to position buttons without spacing magic Update to Go 1.5.3 Fix the undefinded variable error in Project's safe_import_url method Fix misaligned edit button in milestone collection partial Update button styles for Milestones#show Ensure the API doesn't return notes that the current user shouldn't see Add spec for Note#cross_reference_not_visible_for? Remove (invalid) timestamp formatting Move `BroadcastMessage#status` to a helper since it's presentational Update CHANGELOG Broadcast Messages can now be edited Update Broadcast Message features Update BroadcastMessage model Update broadcast_message helper Simplify BroadcastMessage factory Simplify broadcast message JS Remove alert_type attribute from BroadcastMessage Move broadcast message form to a partial ...
\| * \| \| \|	Add mofications to triggers API documentation [ci skip]	Tomasz Maczukin	2016-01-14	1	-32/+12
\| \| \| \| \|
\| * \| \| \|	Update CHANGELOG [ci skip]	Tomasz Maczukin	2016-01-14	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch '8-4-stable' into ci/api-triggers	Tomasz Maczukin	2016-01-14	430	-2642/+4839
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 8-4-stable: (280 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
\| * \| \| \| \|	Modify triggers API documentation style [ci skip]	Tomasz Maczukin	2016-01-14	3	-91/+129
\| \| \| \| \| \|
\| * \| \| \| \|	Add some fixes after review	Tomasz Maczukin	2016-01-13	4	-19/+16
\| \| \| \| \| \|
\| * \| \| \| \|	Change 'trigger_id' to 'token' as resource ID in triggers API	Tomasz Maczukin	2016-01-07	4	-54/+27
\| \| \| \| \| \|
\| * \| \| \| \|	Update ./doc/api	Tomasz Maczukin	2016-01-07	2	-0/+95
\| \| \| \| \| \|
\| * \| \| \| \|	Get show details feature to triggers API	Tomasz Maczukin	2016-01-05	2	-5/+77
\| \| \| \| \| \|
\| * \| \| \| \|	Add create feature to triggers API	Tomasz Maczukin	2016-01-05	2	-0/+45
\| \| \| \| \| \|
\| * \| \| \| \|	Add delete feature to triggers API	Tomasz Maczukin	2016-01-05	2	-0/+52
\| \| \| \| \| \|
\| * \| \| \| \|	Fix ci_trigger_request factory	Tomasz Maczukin	2016-01-05	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add triggers feature to API	Tomasz Maczukin	2016-01-04	4	-4/+71
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fixes-new-layout' into 'master'	Dmitriy Zaporozhets	2016-01-14	2	-35/+39
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes new layout * fix empty project page * fix commit -> builds page missing margin See merge request !2440
\| * \| \| \| \|	add missing padding for commit -> builds page	Dmitriy Zaporozhets	2016-01-14	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Fix layout for empty project	Dmitriy Zaporozhets	2016-01-14	1	-34/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'notification-btn-in-left-field' into 'master'	Drew Blessing	2016-01-14	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes margin and padding ![Screen_Shot_2016-01-14_at_3.10.57_PM](/uploads/83c8b36b01439cb629c91b2dd3a85692/Screen_Shot_2016-01-14_at_3.10.57_PM.png) See merge request !2439
\| * \| \| \| \|	fixes margin and padding	Jacob Schatz	2016-01-14	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'diff-parse-first-commit' into 'master'	Robert Speicher	2016-01-14	2	-2/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly generate diff of orphan commits, like the first commit in a repository Fixes gitlab-org/gitlab_git#14 See merge request !2427
\| * \ \ \ \	Merge branch 'master' into diff-parse-first-commitdiff-parse-first-commit	Douwe Maan	2016-01-14	20	-10/+463
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Properly generate diff of orphan commits, like the first commit in a repository	Douwe Maan	2016-01-14	2	-2/+4
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge branch 'backport-ee' into 'master'	Robert Speicher	2016-01-14	43	-70/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport two commits from EE Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110 See merge request !2424
\| * \| \| \| \|	Param should be present, not just truthybackport-ee	Douwe Maan	2016-01-14	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Prevent circular reference error in Banzai	Douwe Maan	2016-01-14	42	-69/+0
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-fix-cross-reference' into 'master'	Robert Speicher	2016-01-14	2	-3/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix cross-project reference clipboard text See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2339 See merge request !2420
\| * \| \| \| \| \|	centering copy buttonrs-fix-cross-reference	Jacob Schatz	2016-01-13	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix cross-project reference clipboard text	Robert Speicher	2016-01-13	2	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/4183
* \| \| \| \| \| \|	Merge branch 'update_mail_docs' into 'master'	Drew Blessing	2016-01-14	2	-3/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update mailroom/postfix documentation [ci skip] I worked with a customer to troubleshoot some strange Postfix and Mailroom issues. These doc updates aim to help other users avoid the same confusion. See merge request !2430
\| * \| \| \| \| \| \|	Update mailroom/postfix documentation [ci skip]	Drew Blessing	2016-01-14	2	-3/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'ui-fixes' into 'master'	Dmitriy Zaporozhets	2016-01-14	9	-112/+60
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Various UI fixes * Fix missing padding for user/group pages * Fix align of clone panel Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2433
\| * \| \| \| \| \| \| \|	Fix css mess around git clone panel. Align it properly	Dmitriy Zaporozhets	2016-01-14	5	-104/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	Fix missing padding for user/group pages	Dmitriy Zaporozhets	2016-01-14	4	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'ci/api-builds' into 'master'	Douwe Maan	2016-01-14	9	-0/+724
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add builds API References #4264 See merge request !2207
\| * \| \| \| \| \| \| \|	Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatusci/api-builds	Tomasz Maczukin	2016-01-14	3	-5/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into ci/api-builds	Tomasz Maczukin	2016-01-14	73	-240/+1394
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (51 commits) Fix version Fix specs and rubocop warnings Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages fixed LDAP activation on login to use new ldap_blocked state Fix Admin/Users view to position buttons without spacing magic Update to Go 1.5.3 Fix the undefinded variable error in Project's safe_import_url method Update CHANGELOG [ci skip] Add some cosmetic changes to variables API documentation [ci skip] Fix misaligned edit button in milestone collection partial Update button styles for Milestones#show Modify builds API documentation style [ci skip] Modify :ci_variable factory Ensure the API doesn't return notes that the current user shouldn't see Add 'Build' prefix to Variables entry name in API docs index Fix some typos Add spec for Note#cross_reference_not_visible_for? Remove (invalid) timestamp formatting Move `BroadcastMessage#status` to a helper since it's presentational Update CHANGELOG ... Conflicts: doc/api/README.md lib/api/api.rb lib/api/entities.rb
\| * \| \| \| \| \| \| \|	Remove hard-coded id from builds factory	Tomasz Maczukin	2016-01-14	1	-2/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Modify builds API documentation style [ci skip]	Tomasz Maczukin	2016-01-13	1	-16/+66
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update CHANGELOG [ci skip]	Tomasz Maczukin	2016-01-13	1	-0/+1
\| \| \| \| \| \| \| \| \|