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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow primary email to be set to an email that you've already added.change-primary-email	Douwe Maan	2015-04-30	5	-18/+45
\|
*	Merge branch 'search-layout' into 'master'	Dmitriy Zaporozhets	2015-04-29	14	-130/+134
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improvements to search layout Improve search layout to match new UI style and make it more mobile-firendly See merge request !585
\| *	Move search categories (projects, issues etc) below search field. Instead ↵	Dmitriy Zaporozhets	2015-04-29	8	-81/+87
\| \| \| \| \| \| \| \| \| \| \| \|	use sidebar for dashbaord nav Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Continue refactoring and restyle of search layout	Dmitriy Zaporozhets	2015-04-28	9	-68/+72
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| *	Draft improvements to search layout	Dmitriy Zaporozhets	2015-04-28	11	-115/+109
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Fix visibility settings UI in admin area	Dmitriy Zaporozhets	2015-04-29	1	-2/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'footnotes-markdown' into 'master'	Douwe Maan	2015-04-29	1	-1/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add footnotes support to Markdown This merge request fix this issue : https://gitlab.com/gitlab-org/gitlab-ce/issues/555 See merge request !572
\| * \|	Add footnotes support to Markdown	Guillaume Delbergue	2015-04-24	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Guillaume Delbergue <guillaume.delbergue@greensocs.com>
* \| \|	Move service template and project service settings into a shared view	Stan Hu	2015-04-29	3	-147/+77
\| \| \|
* \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-04-29	1	-1/+1
\|\ \ \
\| * \| \|	Fix #9219 Affix menu size change	Kyle	2015-04-29	1	-1/+1
\| \| \|/ \| \|/\|
* \| \|	Revert "Fix '.container or .container-fluid should be the first child inside ↵	Dmitriy Zaporozhets	2015-04-29	1	-2/+2
\|/ / \| \| \| \| \| \| \| \| \| \|	of a .navbar' issue" This reverts commit 570594a469fe481060d312d9d90980c5f9289e2f.
* \|	Merge branch 'rs-issue-2269' into 'master'	Dmitriy Zaporozhets	2015-04-28	3	-23/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate settings for default_url_options Closes #2269 See merge request !1797
\| * \|	Remove duplicate settings for default_url_options	Robert Speicher	2015-04-25	3	-23/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2269
* \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-04-28	2	-3/+5
\|\ \ \
\| * \ \	Merge pull request #8645 from chulkilee/hipchat-api-version	Dmitriy Zaporozhets	2015-04-27	2	-3/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Add api version property on hipchat service
\| \| * \| \|	Add api version property on hipchat service	Chulki Lee	2015-04-27	2	-3/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'admin-add-group-members' into 'master'	Dmitriy Zaporozhets	2015-04-28	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix adding new group members from admin area Fix for #2222 Tests for this case already exists but it was green. It related to current way dealing with ajax selectbox. Improving tests might be a reason for another merge requests - everyone is welcome to participate. See merge request !1796
\| * \| \| \| \|	Fix adding new group members from admin area	Dmitriy Zaporozhets	2015-04-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'fix-relative-submodule-links-with-personal-projects' into 'master'	Dmitriy Zaporozhets	2015-04-27	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken file browsing with relative submodule in personal projects Git submodules with relative links work fine for projects in groups but not in personal projects. This patch fixes this issue. To reproduce the problem, go here: https://gitlab.com/andrewwu.tw/submodule-test/tree/master Closes https://github.com/gitlabhq/gitlabhq/issues/7554 See merge request !565
\| * \| \| \| \|	Fix broken file browsing with relative submodule in personal projects	Stan Hu	2015-04-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/7554
* \| \| \| \| \|	Revert "Added X-GitLab-Event header for web hooks"	Valery Sizov	2015-04-27	7	-21/+15
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
* \| \| \| \|	Merge pull request #9208 from Soullivaneuh/container-class	Jeroen van Baarsen	2015-04-27	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix .container position on navbar
\| * \| \| \| \|	Fix '.container or .container-fluid should be the first child inside of a ↵	Sullivan SENECHAL	2015-04-26	1	-2/+2
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	.navbar' issue
* \| \| \| \|	Merge pull request #9207 from Soullivaneuh/x-ua-compatible	Jeroen van Baarsen	2015-04-27	1	-0/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|	Fix missing X-UA-Compatible meta tag
\| * \| \| \|	Fix "`<head>` is missing X-UA-Compatible `<meta>` tag that disables old IE ↵	Sullivan SENECHAL	2015-04-26	1	-0/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	compatibility modes"
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-04-27	22	-169/+248
\|\ \ \ \
\| * \ \ \	Merge branch 'fix-gitorious-importer' into 'master'	Dmitriy Zaporozhets	2015-04-27	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get Gitorious importer to work again. Fixes #1504. See merge request !576
\| \| * \| \| \|	Get Gitorious importer to work again.fix-gitorious-importer	Douwe Maan	2015-04-24	1	-1/+1
\| \| \|/ / /
\| * \| \| \|	Merge branch 'forked-event' into 'master'	Dmitriy Zaporozhets	2015-04-27	4	-58/+36
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Projects::CreateService to fork projects so that after-create hooks are run. Makes for cleaner code and less duplication, and causes the "User created project Namespace / Project" event to be posted and system hooks to be run. See merge request !575
\| \| * \| \| \|	Use Projects::CreateService to fork projects so that after-create hooks are run.forked-event	Douwe Maan	2015-04-24	4	-58/+36
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'rs-minor-styles' into 'master'	Dmitriy Zaporozhets	2015-04-27	16	-110/+105
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor design change grab-bag :tada: I started with one simple change and found a few more, so here they are. ### Simplify icon style selectors All FontAwesome icons have an `fa` class, so just use that. ### Don't override color of code blocks in notes This was a pet peeve of mine. \| Before \| After \| \|:------:\|:-----:\| \| ![Screen_Shot_2015-04-23_at_4.14.23_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c77cb0816bf0f05cb8c4105cdd8b3ec6/Screen_Shot_2015-04-23_at_4.14.23_PM.png) \| ![Screen_Shot_2015-04-23_at_4.15.44_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/463c1d2052e12444563f5e2c102ac51e/Screen_Shot_2015-04-23_at_4.15.44_PM.png) \| ### Items with tooltips don't need a 'data-original-title' attribute This attribute gets added dynamically by Bootstrap's tooltip JS based on the `title` attribute ### Fix Profile > Design live-updating `ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated. This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes. ### Remove the `has_bottom_tooltip` class Bootstrap's tooltip JS can read the placement from a `data-placement` attribute. Further, when we supply the `selector` option to `tooltip`, tooltips will be added to any dynamically-added elements matching the selector, without us having to re-call the `tooltip` method. See merge request !569
\| \| * \| \| \| \|	Place the logo's tooltip dynamicallyrs-minor-styles	Robert Speicher	2015-04-25	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When collapsed it's on the right like everything else, when expanded it's on the bottom.
\| \| * \| \| \| \|	Add data-placement attributes for all sidebar links	Robert Speicher	2015-04-25	9	-70/+70
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add collapsed navbar links to the default tooltip selector	Robert Speicher	2015-04-25	2	-5/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	There's no longer a reason to re-render the header on Design updates	Robert Speicher	2015-04-25	1	-3/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Remove the `has_bottom_tooltip` class	Robert Speicher	2015-04-25	3	-17/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bootstrap's tooltip JS can read the placement from a `data-placement` attribute. Further, when we supply the `selector` option to `tooltip`, tooltips will be added to any dynamically-added elements matching the selector, without us having to re-call the `tooltip` method.
\| \| * \| \| \| \|	Fix Profile > Design live-updating	Robert Speicher	2015-04-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`ui_blue` wasn't added to the list of classes to remove, so if a user changed to that theme, any subsequent changes wouldn't be live-updated. This change refactors Gitlab::Theme a bit to make it harder for this to happen in the future with new themes.
\| \| * \| \| \| \|	Items with tooltips don't need a 'data-original-title' attribute	Robert Speicher	2015-04-25	1	-22/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bootstrap's tooltip JS just uses the `title` attribute.
\| \| * \| \| \| \|	Don't override color of code blocks in notes	Robert Speicher	2015-04-25	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Simplify icon style selectors	Robert Speicher	2015-04-25	2	-2/+2
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	All FontAwesome icons have an `fa` class, so just use that.
\| * \| \| \| \|	Rename `CommitRange#sha_from_as_param` to `#suffixed_sha_from`rs-refactor-reference-extractor	Robert Speicher	2015-04-25	1	-4/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Rename `CommitRange#inclusive?` to `#exclude_start?`	Robert Speicher	2015-04-25	1	-14/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Remove CommitRange#to_a	Robert Speicher	2015-04-25	1	-13/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Include caret in CommitRange#reference_title	Robert Speicher	2015-04-25	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Remove param from CommitRange#to_s	Robert Speicher	2015-04-25	1	-6/+2
\| \| \| \| \| \|
\| * \| \| \| \|	CommitRange improvements	Robert Speicher	2015-04-25	1	-14/+11
\| \| \| \| \| \|
\| * \| \| \| \|	Add CommitRange class	Robert Speicher	2015-04-25	1	-0/+128
\| \|/ / / /
* \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-04-27	9	-18/+31
\|\ \ \ \ \
\| * \ \ \ \	Merge pull request #8644 from Bugagazavr/hook-events	Dmitriy Zaporozhets	2015-04-27	7	-15/+21
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add X-GitLab-Event header for web hooks