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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge branch 'feature/sign_out_page' into 'master'	Dmitriy Zaporozhets	2015-06-01	7	-2/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to configure a URL to show after sign out Split of !669 as requested This is especially useful with SAML ( !722 ) since the omniauth-saml gem does not support single log-out. This provides a way to log out the user from the SAML IdP after signing out from GitLab. See merge request !725
\| * \| \| \| \|	Allow to configure a URL to show after sign out	Alex Lossent	2015-05-29	7	-2/+20
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Improve UI for accept MR widget	Dmitriy Zaporozhets	2015-06-01	1	-13/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'master' into 'master'	Robert Schilling	2015-05-31	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	small typo See merge request !747
\| * \| \| \| \|	small typo	Terrence Benade	2015-05-31	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'fix/saml_changelog' into 'master'	Robert Schilling	2015-05-29	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix misplaced changelog entry for SAML support See merge request !746
\| * \| \| \|	Fix misplaced changelog entry for SAML support	Alex Lossent	2015-05-29	1	-1/+1
\| \|/ / /
* \| \| \|	Improve UI of project sidebar	Dmitriy Zaporozhets	2015-05-29	3	-9/+14
\|/ / / \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'leave-project' into 'master'	Dmitriy Zaporozhets	2015-05-29	6	-4/+35
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ability to leave project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !744
\| * \| \|	Make leave buttons more explicitleave-project	Dmitriy Zaporozhets	2015-05-29	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Add changelog item about leave project feature	Dmitriy Zaporozhets	2015-05-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Add ability to leave project	Dmitriy Zaporozhets	2015-05-29	3	-1/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'support-edit-target-branch-in-mr' into 'master'	Dmitriy Zaporozhets	2015-05-29	11	-5/+104
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support editing target branch of merge request ### What does this MR do? This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens. ### Why was this MR needed? Because lots of people requested this feature. :) ### Screenshots Edit MR page ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9b3d405bf7b5f945e35bae3534c2b67b/image.png) New MR page ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3657a2a9efad6d10e8470637d1166bdb/image.png) System note ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cc8066f3d3bdf09c0cce27193210567d/image.png) ### What are the relevant issue numbers? * Closes https://github.com/gitlabhq/gitlabhq/issues/7105 * See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130! See merge request !738
\| * \| \| \|	Support editing target branch of merge request	Stan Hu	2015-05-29	11	-5/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/7105 See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
* \| \| \| \|	Merge branch 'user-oauth-applications' into 'master'	Dmitriy Zaporozhets	2015-05-29	9	-29/+63
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to disallow users from registering any application to use GitLab as an OAuth provider Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2264. ![Screen_Shot_2015-05-29_at_13.30.11](https://gitlab.com/gitlab-org/gitlab-ce/uploads/300f8e9ecbeb3d353ebc33a63cdef4e9/Screen_Shot_2015-05-29_at_13.30.11.png) See merge request !742
\| * \| \| \| \|	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 'leave-group' into 'master'	Dmitriy Zaporozhets	2015-05-29	5	-6/+15
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	User should be able to leave group. If not - show him proper message Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !743
\| * \| \| \| \|	Fix tests for group leave feature	Dmitriy Zaporozhets	2015-05-29	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \|	User should be able to leave group. If not - show him proper message	Dmitriy Zaporozhets	2015-05-29	3	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-29	8	-4/+109
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'mr-wip-text' into 'master'	Dmitriy Zaporozhets	2015-05-29	2	-4/+5
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Shorten merge request WIP text. ![Screen_Shot_2015-05-29_at_11.37.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/5853d9057103bdaacded17798378f68e/Screen_Shot_2015-05-29_at_11.37.46.png) ![Screen_Shot_2015-05-29_at_11.37.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/be96ee32ab5a8f23835dc37306259b17/Screen_Shot_2015-05-29_at_11.37.49.png) See merge request !741
\| \| * \| \| \| \|	Shorten merge request WIP text.	Douwe Maan	2015-05-29	2	-4/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Style header search field on focus	Dmitriy Zaporozhets	2015-05-29	1	-0/+7
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	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>