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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add option to disallow users from registering any application to use GitLab ↵user-oauth-applications	Douwe Maan	2015-05-29	9	-29/+63
\| \| \| \|	as an OAuth provider
*	Merge branch 'feature/saml_support' into 'master'	Douwe Maan	2015-05-29	7	-0/+104
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add SAML support via Omniauth Split of !669, with doc See merge request !722
\| *	Add SAML support via Omniauth	Alex Lossent	2015-05-27	7	-0/+104
\| \|
* \|	Merge branch 'rs-merge-request-tabs-the-third' into 'master'	Dmitriy Zaporozhets	2015-05-29	1	-0/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include location.search and location.hash in URL for replaceState Forgot these :blush: See merge request !740
\| * \|	Include location.search and location.hash in URL for replaceState	Robert Speicher	2015-05-29	1	-0/+3
\| \| \|
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-29	23	-547/+313
\|\ \ \
\| * \ \	Merge branch 'rs-teaspoon' into 'master'	Dmitriy Zaporozhets	2015-05-29	23	-547/+313
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Teaspoon for Javascript testing Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect. See https://github.com/modeset/teaspoon See merge request !715
\| \| * \|	Disable Rack::MiniProfiler for /teaspoon pathrs-teaspoon	Robert Speicher	2015-05-28	1	-1/+2
\| \| \| \|
\| \| * \|	Update jasmine:ci task to use teaspoon	Robert Speicher	2015-05-28	1	-1/+1
\| \| \| \|
\| \| * \|	Stub ajax in JS specs	Robert Speicher	2015-05-28	2	-2/+5
\| \| \| \|
\| \| * \|	Remove jasmine-fixture, use teaspoon fixtures	Robert Speicher	2015-05-28	9	-491/+64
\| \| \| \|
\| \| * \|	Javascripts don't need to require jquery or bootstrap explicitly	Robert Speicher	2015-05-28	5	-8/+1
\| \| \| \|
\| \| * \|	teaspoon install	Robert Speicher	2015-05-28	2	-0/+224
\| \| \| \|
\| \| * \|	Remove jasmine-rails; add teaspoon	Robert Speicher	2015-05-28	6	-46/+18
\| \| \| \|
* \| \| \|	Fix diff header with submodule change	Dmitriy Zaporozhets	2015-05-29	1	-2/+3
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-29	9	-60/+97
\|\ \ \
\| * \ \	Merge branch 'rs-persist-tab-selection-more-betterer' into 'master'	Dmitriy Zaporozhets	2015-05-29	8	-59/+96
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve MergeRequest tab-persisting behavior Now uses the path instead of the hash. See discussion in !728 See merge request !737
\| \| * \| \|	Improve MergeRequest tab-persisting behaviorrs-persist-tab-selection-more-betterer	Robert Speicher	2015-05-29	3	-35/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now uses the path instead of the hash. See discussion in #728.
\| \| * \| \|	Add MergeRequests#commits action and route	Robert Speicher	2015-05-29	3	-17/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/:namespace_id/:project_id/merge_requests/:id/commits(.:format)
\| \| * \| \|	Bump turbolinks version	Robert Speicher	2015-05-29	2	-7/+7
\| \| \|/ /
\| * \| \|	Merge branch 'master' into 'master'	Robert Speicher	2015-05-29	1	-1/+1
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra brace Extraneous curly brace creeped in prior commit. See merge request !734
\| \| * \|	Remove extra brace	Mike Butsko	2015-05-28	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #9318 from jvanbaarsen/allow-special-chars-bio	Dmitriy Zaporozhets	2015-05-29	3	-12/+17
\|\ \ \ \| \|/ / \|/\| \|	Allow special characters in users bio
\| * \|	Allow special characters in users bio	Jeroen van Baarsen	2015-05-28	3	-12/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	What does this do? It removes the very strict sanitation on the users bio field, so that people can have a bio like "I <3 GitLab" Why is this needed? Currently when you enter a bio with "I <3 GitLab", we only store "I ". This is unexpected behaviour, since we want users to have a normal profile, without having to worry what characters are allowed and which are not. Related issues: Fixes https://github.com/gitlabhq/gitlabhq/issues/5625 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \|	Merge branch 'nicer-acccount-page' into 'master'	Dmitriy Zaporozhets	2015-05-28	2	-14/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make user settings account page nicer * make 2 factor auth section `panel-default` * make oauth buttons smaller * remove primary button from reset token form ![Screenshot_2015-05-28_20.37.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e536723e087b72a5c08b29072fb4972f/Screenshot_2015-05-28_20.37.30.png) See merge request !733
\| * \| \|	Make user settings account page nicer	Dmitriy Zaporozhets	2015-05-28	2	-14/+14
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'project-aside' into 'master'	Dmitriy Zaporozhets	2015-05-28	2	-79/+77
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use panels instead of well for widgets in project sidebar Cleaner look and less distractive ![Screenshot_2015-05-28_17.31.27](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4f8e58f76c7f62c488dd571c313e21e/Screenshot_2015-05-28_17.31.27.png) See merge request !732
\| * \| \|	Use panels instead of well for widgets in project sidebar	Dmitriy Zaporozhets	2015-05-28	2	-79/+77
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'profile-settings'	Dmitriy Zaporozhets	2015-05-28	11	-110/+129
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/profiles/accounts/show.html.haml
\| * \| \|	Fix profile tests after header rename	Dmitriy Zaporozhets	2015-05-28	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Prefer panels over fieldset when different forms	Dmitriy Zaporozhets	2015-05-28	3	-83/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Consistent header look for setting pages	Dmitriy Zaporozhets	2015-05-28	3	-14/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Re-organize profile settings titles and headers	Dmitriy Zaporozhets	2015-05-28	8	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-28	15	-42/+112
\|\ \ \ \
\| * \ \ \	Merge branch 'user-destroy-wo-groups' into 'master'	Dmitriy Zaporozhets	2015-05-28	10	-33/+69
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can not remove user if he/she is an only owner of group To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !730
\| \| * \| \| \|	Fix current user removaluser-destroy-wo-groups	Dmitriy Zaporozhets	2015-05-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Add CHANGELOG item	Dmitriy Zaporozhets	2015-05-28	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	You can not remove user if he/she is an only owner of group	Dmitriy Zaporozhets	2015-05-28	9	-33/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	Merge branch 'fix-git-blame-syntax-highlighting' into 'master'	Douwe Maan	2015-05-28	6	-9/+43
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix git blame syntax highlighting when different commits break up lines ### What does this MR do? This MR fixes a bug where syntax highlighting would not work properly in certain lines when doing a `git blame` view of a file. Also, this MR reuses the Rugments lexer and formatter for each `git blame` commit block, which should make things faster and reduce overhead. ### Why was this MR needed? When doing a `git blame`, GitLab feeds the Rugments lexer/formatter blocks of code based on the latest commit for each line. However, this can cause lexer to fail because the state is cleared between each block of code, which causes `highlight` to fallback to the plaintext lexer. For example, notice this unhighlighted line in [this file](https://gitlab.common-lisp.net/cmucl/cmucl/blame/master/src/assembly/assemfile.lisp): ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b403fe5c2b883882a9eeea7e0409c583/image.png) The fixed version looks like this: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/32c4d7c8ff15a7d59b364dd988f7c657/image.png) This MR requires a patch to rugments to allow the `continue` option to be passed to the lexer. * https://github.com/rumpelsepp/rugments/pull/24 * https://github.com/rumpelsepp/rugments/pull/23 * Also submitted to rouge: https://github.com/jneen/rouge/pull/267 ### What are the relevant issue numbers? Closes #1521 See merge request !697
\| \| * \| \| \|	Fix git blame syntax highlighting when different commits break up lines	Stan Hu	2015-05-27	6	-9/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1521
* \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-05-28	1	-3/+15
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge pull request #9335 from stefan-it/documentation/timezone-clarifications	Jeroen van Baarsen	2015-05-28	1	-3/+15
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|	[Documentation] non-omnibus instructions for changing time zone
\| \| * \| \| \| \|	Adds new section for changing time zone in GitLab configuration file. New ↵	Stefan Schweter	2015-05-27	1	-3/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	section added for changing time zone in Omnibus installations.
* \| \| \| \| \| \|	Merge branch 'chlg-update' into 'master'	Marin Jankovski	2015-05-28	1	-7/+14
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update changelog for 7.11.4 See merge request !1833
\| * \| \| \| \| \|	update changelog for 7.11.4	Job van der Voort	2015-05-28	1	-7/+14
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #9184 from rumpelsepp/english	Jeroen van Baarsen	2015-05-28	1	-17/+18
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	Some language improvements
\| * \| \| \| \|	Some language improvements	Stefan Tatschner	2015-05-27	1	-17/+18
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'rs-persist-tab-selection' into 'master'	Dmitriy Zaporozhets	2015-05-28	4	-59/+100
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Persist current merge request tab selection via URL Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350 See merge request !728
\| * \| \| \| \|	Persist current merge request tab selection via URLrs-persist-tab-selection	Robert Speicher	2015-05-27	4	-59/+100
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
* \| \| \| \| \|	Merge branch 'header-icons' into 'master'	Dmitriy Zaporozhets	2015-05-28	1	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change some header icons icons changed: * profile settings: user icon to cog * admin area: cogs to wrench Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/719#note_1289290 ![Screenshot_2015-05-27_17.58.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/762de4afb8ae229a96ead8b2d213b2a4/Screenshot_2015-05-27_17.58.12.png) See merge request !726