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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove projects before group/user. Remove namespace directory asyncfix-group-remove	Dmitriy Zaporozhets	2015-06-03	3	-2/+19
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Wrap group removal into service	Dmitriy Zaporozhets	2015-06-03	3	-2/+13
\| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'ignore-references' into 'master'	Dmitriy Zaporozhets	2015-06-02	1	-15/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't notify users mentioned in code blocks or blockquotes. cc @rspeicher See merge request !753
\| *	Actually ignore references in code blocks etc.	Douwe Maan	2015-06-02	1	-15/+12
\| \|
* \|	Add a `pipeline` context option for SanitizationFilter	Robert Speicher	2015-06-02	2	-2/+2
\| \| \| \| \| \| \| \| \| \|	When this option is `:description`, we use a more restrictive whitelist. This is used for Project and Group description fields.
* \|	Remove now-unused `escaped_autolink` helper and rails_autolink gem	Robert Speicher	2015-06-02	1	-4/+0
\| \|
* \|	Render Group and Project descriptions with our Markdown pipeline	Robert Speicher	2015-06-02	3	-6/+8
\| \|
* \|	GitLab CI service sends gitlab-ci.yml fileci_yml_file	Valery Sizov	2015-06-02	1	-0/+14
\| \|
* \|	Improve hover color	Dmitriy Zaporozhets	2015-06-02	2	-2/+1
\|/ \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
*	Merge branch 'web-editor-rugged' into 'master'	Dmitriy Zaporozhets	2015-06-02	7	-23/+95
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create and edit files in web editor via rugged - [x] create file via rugged - [x] update file via rugged - [x] remove file via rugged - [ ] fix tests - [x] remove satellites code - [x] create activity event for new/edit file via rugged - [x] base64 support Part of https://dev.gitlab.org/gitlab/gitlabhq/issues/2300 See merge request !751
\| *	Make web editor work correctly after switch from satellites	Dmitriy Zaporozhets	2015-06-02	5	-5/+7
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Remove files in web editor using rugged	Dmitriy Zaporozhets	2015-06-02	2	-14/+37
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Create activity event and execute hooks on web editor commit	Dmitriy Zaporozhets	2015-06-02	3	-3/+11
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Use rugged in web editor for base64 encoding	Dmitriy Zaporozhets	2015-06-01	2	-34/+28
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Allow base64 for edit blobs	Dmitriy Zaporozhets	2015-06-01	1	-2/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Fix adding new file to empty repo	Dmitriy Zaporozhets	2015-06-01	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Create and edit files in web editor via rugged	Dmitriy Zaporozhets	2015-06-01	3	-14/+59
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'rs-issue-1721' into 'master'	Douwe Maan	2015-06-02	1	-3/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link_to_gfm with only a reference having the incorrect link Before: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` After: ```ruby link_to_gfm("#4", "/foo") # => "<a href="/foo">#4</a>" link_to_gfm("See #4", "/foo") # => "<a href="/foo">See </a><a href="/namespace/project/issues/4" class="gfm gfm-issue">#4</a>" ``` Closes #192 Closes #1721 Closes [GitHub #7115](https://github.com/gitlabhq/gitlabhq/issues/7115) See merge request !739
\| * \|	Fix link_to_gfm with only a reference having the incorrect linkrs-issue-1721	Robert Speicher	2015-05-29	1	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #1721
* \| \|	Merge branch 'feature/sso_integration' into 'master'	Douwe Maan	2015-06-02	1	-0/+16
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an option to automatically sign-in with an Omniauth provider Split of !669 as requested This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication. See merge request !723
\| * \|	Add an option to automatically sign-in with an Omniauth provider without ↵	Alex Lossent	2015-05-29	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	showing the GitLab sign-in page This is useful when integrating with existing SSO environments and we want to use a single Omniauth provider for all user authentication.
* \| \|	improve navbar collapse for mobile views	Dmitriy Zaporozhets	2015-06-01	3	-13/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Fix header overflow for big title	Dmitriy Zaporozhets	2015-06-01	2	-23/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Refactor header views	Dmitriy Zaporozhets	2015-06-01	7	-27/+18
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	More fixes to header css	Dmitriy Zaporozhets	2015-06-01	6	-9/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Refactor header css/htmlrefactor-header	Dmitriy Zaporozhets	2015-06-01	7	-153/+153
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Better margin for header in accept MR widget	Dmitriy Zaporozhets	2015-06-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Show avatars in merge widget and fix mr download button overflow	Dmitriy Zaporozhets	2015-06-01	2	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'disable-mr-source-branch-change' into 'master'	Dmitriy Zaporozhets	2015-06-01	1	-1/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable changing of the source branch in merge request update API As noted in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/738#note_1307284 See merge request !745
\| * \| \|	Disable changing of the source branch in merge request update API	Stan Hu	2015-05-29	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch 'feature/sign_out_page' into 'master'	Dmitriy Zaporozhets	2015-06-01	4	-1/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-1/+12
\| \| \|/ / \| \|/\| \|
* \| \| \|	Improve UI for accept MR widget	Dmitriy Zaporozhets	2015-06-01	1	-13/+7
\| \|/ / \|/\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	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	5	-4/+34
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 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	5	-2/+55
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-2/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-28/+55
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-28/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as an OAuth provider
* \| \| \| \|	Merge branch 'leave-group' into 'master'	Dmitriy Zaporozhets	2015-05-29	2	-5/+8
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \|	User should be able to leave group. If not - show him proper message	Dmitriy Zaporozhets	2015-05-29	2	-5/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-29	2	-4/+7
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'mr-wip-text' into 'master'	Dmitriy Zaporozhets	2015-05-29	1	-4/+4
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'feature/saml_support' into 'master'	Douwe Maan	2015-05-29	1	-0/+3
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add SAML support via Omniauth Split of !669, with doc See merge request !722
\| \| * \| \| \|	Add SAML support via Omniauth	Alex Lossent	2015-05-27	1	-0/+3
\| \| \| \| \| \|
* \| \| \| \| \|	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