16749 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitriy Zaporozhets	2c403dfd92	Remove file api tests which depend on old satellite logic ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-02 10:24:50 +02:00
Dmitriy Zaporozhets	541133197b	Use rugged in web editor for base64 encoding ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 23:43:35 +02:00
Dmitriy Zaporozhets	d9d9c7d7bc	Allow base64 for edit blobs ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 23:43:08 +02:00
Dmitriy Zaporozhets	27a158506e	Fix adding new file to empty repo ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 21:17:13 +02:00
Dmitriy Zaporozhets	734a4ba87d	Create and edit files in web editor via rugged ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 20:49:11 +02:00
Dmitriy Zaporozhets	76ae871908	Merge branch 'refactor-header' into 'master' ... Refactor header css/html * Fixes UI issue with header on zoom * Replace duplicate numbers with variable * Better names for css classes * refactor header views Fixes #1640 See merge request !750	2015-06-01 16:33:14 +00:00
Dmitriy Zaporozhets	01f6ae2351	improve navbar collapse for mobile views ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 17:55:20 +02:00
Dmitriy Zaporozhets	a74dfa6e74	Fix header overflow for big title ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 17:10:04 +02:00
Dmitriy Zaporozhets	e7e07fab5d	Refactor header views ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 17:09:30 +02:00
Dmitriy Zaporozhets	46e3d13eac	More fixes to header css ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 16:36:26 +02:00
Dmitriy Zaporozhets	d4dde374aa	Refactor header css/html ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 15:45:36 +02:00
Dmitriy Zaporozhets	a42f4d8585	Merge branch 'linguist-comment' into 'master' ... Explain gitlab forks in Gemfile Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2358 See merge request !749	2015-06-01 11:14:51 +00:00
Dmitriy Zaporozhets	ea498c4421	Add comments about gitlab forks ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 12:59:02 +02:00
Dmitriy Zaporozhets	7927c320e8	Exmplain gitlab-linguist fork existence ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 12:37:08 +02:00
Dmitriy Zaporozhets	ed7f42fd5c	Better margin for header in accept MR widget ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 12:25:05 +02:00
Dmitriy Zaporozhets	38bac5d7ae	Show avatars in merge widget and fix mr download button overflow ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 12:17:55 +02:00
Dmitriy Zaporozhets	9c6f6a193a	Merge branch 'disable-mr-source-branch-change' into 'master' ... 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	2015-06-01 10:04:20 +00:00
Dmitriy Zaporozhets	b862998b8e	Merge branch 'feature/sign_out_page' into 'master' ... 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	2015-06-01 09:58:52 +00:00
Dmitriy Zaporozhets	584ac316ac	Improve UI for accept MR widget ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-06-01 11:56:09 +02:00
Robert Schilling	d38b76a6b8	Merge branch 'master' into 'master' ... small typo See merge request !747	2015-05-31 17:41:59 +00:00
Terrence Benade	9ea231b5a5	small typo	2015-05-31 11:20:39 +00:00
Robert Schilling	7c1f984c3c	Merge branch 'fix/saml_changelog' into 'master' ... Fix misplaced changelog entry for SAML support See merge request !746	2015-05-29 20:10:17 +00:00
Alex Lossent	9d733d14b8	Fix misplaced changelog entry for SAML support	2015-05-29 21:55:51 +02:00
Stan Hu	85145d1d77	Disable changing of the source branch in merge request update API	2015-05-29 09:40:35 -07:00
Alex Lossent	60225a067d	Allow to configure a URL to show after sign out	2015-05-29 18:20:15 +02:00
Dmitriy Zaporozhets	467d7f6720	Improve UI of project sidebar ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-29 18:12:31 +02:00
Dmitriy Zaporozhets	a3b60982e5	Merge branch 'leave-project' into 'master' ... Add ability to leave project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !744	2015-05-29 15:10:46 +00:00
Dmitriy Zaporozhets	a1c45338f3	Merge branch 'support-edit-target-branch-in-mr' into 'master' ... 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**  **New MR page**  **System note**  ### 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	2015-05-29 15:01:54 +00:00
Dmitriy Zaporozhets	ab2e67550b	Merge branch 'user-oauth-applications' into 'master' ... 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.  See merge request !742	2015-05-29 14:51:33 +00:00
Dmitriy Zaporozhets	7815f9ddac	Make leave buttons more explicit ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-29 16:34:26 +02:00
Dmitriy Zaporozhets	4f0f182244	Add changelog item about leave project feature ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-29 16:26:08 +02:00
Dmitriy Zaporozhets	2afa5fcb52	Add ability to leave project ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-29 16:23:36 +02:00
Dmitriy Zaporozhets	394fe7614c	Merge branch 'leave-group' into 'master' ... 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	2015-05-29 13:35:05 +00:00
Dmitriy Zaporozhets	907bbb2b05	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-29 15:14:48 +02:00
Dmitriy Zaporozhets	d4a58c685f	Style header search field on focus ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-29 15:14:29 +02:00
Dmitriy Zaporozhets	85de253ee1	Fix tests for group leave feature ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-29 15:07:04 +02:00
Dmitriy Zaporozhets	cef746dc94	User should be able to leave group. If not - show him proper message ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-29 14:12:30 +02:00
Dmitriy Zaporozhets	4a1df710f8	Merge branch 'mr-wip-text' into 'master' ... Shorten merge request WIP text.   See merge request !741	2015-05-29 11:34:18 +00:00
Douwe Maan	96d6fdc27c	Add option to disallow users from registering any application to use GitLab as an OAuth provider	2015-05-29 13:29:16 +02:00
Stan Hu	5e4384ec9b	Support editing target branch of merge request ... Closes https://github.com/gitlabhq/gitlabhq/issues/7105 See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130	2015-05-29 04:08:08 -07:00
Douwe Maan	70b29c3576	Merge branch 'feature/saml_support' into 'master' ... Add SAML support via Omniauth Split of !669, with doc See merge request !722	2015-05-29 10:37:27 +00:00
Dmitriy Zaporozhets	aa97325dea	Merge branch 'rs-merge-request-tabs-the-third' into 'master' ... Include location.search and location.hash in URL for replaceState Forgot these 😊 See merge request !740	2015-05-29 10:23:33 +00:00
Douwe Maan	d5b1c58e26	Shorten merge request WIP text.	2015-05-29 11:37:12 +02:00
Robert Speicher	7f529ef0f7	Include location.search and location.hash in URL for replaceState	2015-05-29 05:15:09 -04:00
Dmitriy Zaporozhets	2f3a11fed3	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-29 11:11:12 +02:00
Dmitriy Zaporozhets	acb7721fe8	Merge branch 'rs-teaspoon' into 'master' ... 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	2015-05-29 09:10:46 +00:00
Dmitriy Zaporozhets	e11e042d89	Fix diff header with submodule change ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>	2015-05-29 11:01:40 +02:00
Dmitriy Zaporozhets	ac584d6b08	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-05-29 10:57:35 +02:00
Dmitriy Zaporozhets	c090ebc07e	Merge branch 'rs-persist-tab-selection-more-betterer' into 'master' ... Improve MergeRequest tab-persisting behavior Now uses the path instead of the hash. See discussion in !728 See merge request !737	2015-05-29 08:44:23 +00:00
Dmitriy Zaporozhets	d047d299bf	Merge pull request #9318 from jvanbaarsen/allow-special-chars-bio ... Allow special characters in users bio	2015-05-29 10:41:01 +02:00