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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Change placeholder text to just 'search'search-on-groups-is-ugly	Jacob Schatz	2016-02-04	2	-13/+1
\|
*	Merge branch 'fix-test' into 'master'	Dmitriy Zaporozhets	2016-02-04	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix broken tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @DouweM See merge request !2708
\| *	Fix broken tests	Dmitriy Zaporozhets	2016-02-04	1	-2/+2
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'doc_bug' into 'master'	Drew Blessing	2016-02-04	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix documentation bug / typo Hey, noticed this a little bit ago. Need to get the example matching up with the following explanation. See merge request !2709
\| * \|	fix documentation bug / typo	Eric L Frederich	2016-02-04	1	-1/+1
\| \| \|
* \| \|	Merge branch 'fix/atom-url-issue' into 'master'	Douwe Maan	2016-02-04	6	-4/+93
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix atom url issue on projects This MR adds prevents a project to have a path ending in .atom that conflicts with the feed and Adds a migration to migrate old .atom projects to a different path Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3699 See merge request !2651
\| * \|	refactored migration based on feedback	James Lopez	2016-02-04	1	-1/+5
\| \| \|
\| * \|	refactored migration and spec based on feedback	James Lopez	2016-02-04	2	-8/+14
\| \| \|
\| * \|	fixed move project method in migration	James Lopez	2016-02-02	3	-35/+15
\| \| \|
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue	James Lopez	2016-02-02	21	-32/+414
\| \|\ \
\| * \| \|	added TODO to not working method	James Lopez	2016-02-01	1	-0/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue	James Lopez	2016-02-01	57	-379/+433
\| \|\ \ \
\| * \| \| \|	WIP - refactored migration	James Lopez	2016-02-01	2	-7/+43
\| \| \| \| \|
\| * \| \| \|	WIP - add migration	James Lopez	2016-01-29	1	-0/+54
\| \| \| \| \|
\| * \| \| \|	refactor previous test and add validation to project model	James Lopez	2016-01-29	2	-8/+5
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/atom-url-issue	James Lopez	2016-01-29	258	-1732/+12958
\| \|\ \ \ \
\| * \| \| \| \|	WIP - spec failure on .atom project URL	James Lopez	2016-01-22	1	-0/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'origin/rs-database-info'	Dmitriy Zaporozhets	2016-02-04	4	-6/+58
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
\| * \| \| \| \|	Display database type and version in Administration dashboardrs-database-info	Robert Speicher	2016-02-02	4	-6/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12900
* \| \| \| \| \|	Merge branch 'rs-backport-ldap-2fa' into 'master'	Dmitriy Zaporozhets	2016-02-04	3	-28/+33
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Two-factor Authentication for LDAP users Closes #12653 See merge request !2688
\| * \| \| \| \| \|	Support Two-factor Authentication for LDAP usersrs-backport-ldap-2fa	Robert Speicher	2016-02-03	3	-28/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #12653
* \| \| \| \| \| \|	Merge branch 'remove-newrelic' into 'master'	Dmitriy Zaporozhets	2016-02-04	3	-20/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove newrelic gem. Closes #12860 See merge request !2682
\| * \| \| \| \| \| \|	Remove newrelic gem. Closes #12860remove-newrelic	Josh Frye	2016-02-03	3	-20/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'better-search-autocomplete'	Dmitriy Zaporozhets	2016-02-04	2	-2/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	In search autocomplete show only groups and projects you are member ofbetter-search-autocomplete	Dmitriy Zaporozhets	2016-02-04	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For big instances search autocomplet is flooded with groups you have no access to and insternal/public projects you don't care. It affects way how easily you can go to group/project you are actually member of Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'disable-remove-source-branch' into 'master'	Douwe Maan	2016-02-04	3	-2/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide remove source branch button when new commit is added to branch Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch /cc @DouweM See merge request !2701
\| * \| \| \| \| \| \| \| \|	Hide remove source branch button when new commit is added to branch	Zeger-Jan van de Weg	2016-02-04	3	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch
* \| \| \| \| \| \| \| \| \|	Merge branch 'new-issue-projects-sort' into 'master'	Dmitriy Zaporozhets	2016-02-04	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort projects by last activity for new issue dropdown When creating new issue from dashboard page I want to see projects sorted by last activity instead of ID Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2702
\| * \| \| \| \| \| \| \| \|	Sort projects by last activity for new issue dropdownnew-issue-projects-sort	Dmitriy Zaporozhets	2016-02-04	1	-1/+1
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When creating new issue from dashboard page I want to see projects sorted by last activity instead of ID Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'rs-whitelist-in-pipeline' into 'master'	Douwe Maan	2016-02-04	4	-31/+50
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Pipelines responsible for defining their custom whitelist This allows for future pipelines to more easily define a custom whitelist. See merge request !2693
\| * \| \| \| \| \| \| \| \|	Make Pipelines responsible for defining their custom whitelistrs-whitelist-in-pipeline	Robert Speicher	2016-02-03	4	-31/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows for future pipelines to more easily define a custom whitelist.
* \| \| \| \| \| \| \| \| \|	Merge branch 'wipMergeSpacing' into 'master'	Douwe Maan	2016-02-04	3	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No space required after WIP identifier Fixes #2426 Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap"). See merge request !1876
\| * \| \| \| \| \| \| \| \|	Removed redundent and incorrect tests on WIP	Ted Hogan	2016-01-06	1	-10/+0
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into wipMergeSpacing	Ted Hogan	2015-12-29	1236	-13436/+37376
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	No space required after WIP identifier	Ted Hogan	2015-11-23	3	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modified changelog
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sort-projects-dropdown' into 'master'	Dmitriy Zaporozhets	2016-02-04	3	-3/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sort projects by last activity for project switcher in header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13172 See merge request !2692
\| * \| \| \| \| \| \| \| \| \| \|	Satisfy rubocop	Dmitriy Zaporozhets	2016-02-04	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \| \|	Sort projects by last activity for project switcher in headersort-projects-dropdown	Dmitriy Zaporozhets	2016-02-03	3	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'use-top-area' into 'master'	Dmitriy Zaporozhets	2016-02-03	10	-62/+83
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use top-area component for top page navigation for pages that contains list of items Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2686
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into use-top-area	Dmitriy Zaporozhets	2016-02-03	20	-59/+53
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dashboard-sort-dropdown' into 'master'	Dmitriy Zaporozhets	2016-02-03	11	-38/+40
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sort dropdown to dashboard projects page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> First step to improve projects page. Related to !2568 and #3968 See merge request !2691
\| * \| \| \| \| \| \| \| \| \| \|	Add sort dropdown to dashboard projects pagedashboard-sort-dropdown	Dmitriy Zaporozhets	2016-02-03	11	-38/+40
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'attach-file-cursor-position' into 'master'	Jacob Schatz	2016-02-03	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds the markdown link at the cursor poisition When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position ![drop-image-markdown](/uploads/52f41e38faca48c9ee01a02a75ec71be/drop-image-markdown.gif) Tested in Chrome & Firefox and both working fine :thumbsup: Fixes #12822 cc. @jschatz1 See merge request !2648
\| * \| \| \| \| \| \| \| \| \| \|	Keeps cursor at the correct place after changing text in dropzone	Phil Hughes	2016-01-29	1	-7/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Adds the markdown link at the cursor poisition	Phil Hughes	2016-01-29	1	-1/+6
\| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When writing a comment and then dropping an image it will correctly add the image markdown link at the cursor position Fixes #12822
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'remove-useless-text-tips' into 'master'	Jacob Schatz	2016-02-03	4	-12/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove useless text tips on commonly used pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2687
\| * \| \| \| \| \| \| \| \| \| \|	Remove useless text tips on commonly used pages	Dmitriy Zaporozhets	2016-02-03	4	-12/+0
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ui-fixes' into 'master'	Jacob Schatz	2016-02-03	2	-2/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing space between fork and star icons Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !2685
\| * \| \| \| \| \| \| \| \| \| \|	Fix missing space between fork and star iconsui-fixes	Dmitriy Zaporozhets	2016-02-03	2	-2/+6
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'omniauth-saml-update' into 'master'	Robert Speicher	2016-02-03	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated omniuath-saml to the latest version. See merge request !2684