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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \|	Redirect to sign in page after signing out.	Douwe Maan	2015-04-18	2	-0/+5
\| \| \| \| \|
\| * \| \| \|	Merge branch 'rs-rails-env-predicates' into 'master'	Dmitriy Zaporozhets	2015-04-23	2	-2/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix two places where we should be using `Rails.env.development?` See merge request !550
\| \| * \| \| \|	Fix two places where we should be using `Rails.env.development?`rs-rails-env-predicates	Robert Speicher	2015-04-20	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #9062 from fgimian/omniauth-disable-turbolink	Dmitriy Zaporozhets	2015-04-23	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Disable turbolinks for omniauth link to avoid rendering problems
\| * \| \| \| \|	Disable turbolinks for omniauth link to avoid rendering problems	Fotis Gimian	2015-03-31	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue-body-code-mentions' into 'master'	Dmitriy Zaporozhets	2015-04-23	3	-3/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug causing at-username inside code blocks to sometimes be picked up as a user mention. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2254. See merge request !553
\| * \| \| \| \| \|	Fix bug causing `@whatever` inside code blocks to sometimes be picked up as ↵issue-body-code-mentions	Douwe Maan	2015-04-21	3	-4/+5
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	a user mention.
* \| \| \| \| \|	Merge branch 'rs-search_text_nodes' into 'master'	Dmitriy Zaporozhets	2015-04-23	2	-2/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `search_text_nodes` helper in our custom filters Closes #1477 See merge request !561
\| * \| \| \| \| \|	Use `search_text_nodes` helper in our custom filtersrs-search_text_nodes	Robert Speicher	2015-04-22	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1477
* \| \| \| \| \| \|	Merge branch 'new-sidebar' into 'master'	Dmitriy Zaporozhets	2015-04-23	33	-248/+290
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New sidebar design I want to make separation between sidebar and content - [x] change sidebar and header colors - [x] change colors for old light theme so it matches dark style too - [x] rename theme names to something more reasonable - [x] fix header logo collapse with JS - [x] fix navless layouts (explore page, login page, snippets, user page) - [x] fix tests See merge request !558
\| * \ \ \ \ \ \	Merge branch 'master' into new-sidebar	Dmitriy Zaporozhets	2015-04-23	135	-1462/+3533
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/snippets_controller.rb
* \| \| \| \| \| \| \|	Merge pull request #8996 from vinkla/patch-1	Marin Jankovski	2015-04-23	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Node.js Error in Documentation
\| * \| \| \| \| \| \| \|	Fix nodejs installation guide in documentation.	Vincent Klaiber	2015-04-23	1	-0/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Move the upgrade document to the correct location.	Marin Jankovski	2015-04-23	1	-0/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-04-22	1	-5/+5
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'upgrader-for-7.10' into 'master'	Job van der Voort	2015-04-22	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update command in upgrader docs to work with 7.10.0. See merge request !562
\| \| * \| \| \| \| \| \| \|	Update command in upgrader docs to work with 7.10.0.	Douwe Maan	2015-04-22	1	-5/+5
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-04-22	3	-74/+74
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge pull request #9078 from ikappas/project-services-extend-ui	Dmitriy Zaporozhets	2015-04-22	3	-74/+74
\| \|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|	Add Fieldset Support to Project Services Views
\| \| * \| \| \| \| \| \| \|	added fieldset support to project and admin services views.	Ioannis Kappas	2015-04-22	3	-74/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	split field logic to separate template.
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-reply-hotkey' into 'master'	Dmitriy Zaporozhets	2015-04-22	18	-100/+624
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"Reply quoting selected text" shortcut/hotkey Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms. This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs. See merge request !1775
\| * \| \| \| \| \| \| \| \|	Add changelog entry [ci skip]	Robert Speicher	2015-04-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Typo: Issueable -> Issuable	Robert Speicher	2015-04-18	4	-7/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add JS specs for replyWithSelectedText	Robert Speicher	2015-04-18	3	-0/+519
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add hotkey for "reply with selected text" to Issueable	Robert Speicher	2015-04-18	1	-1/+27
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add 'reply' hotkey to help modal	Robert Speicher	2015-04-18	1	-0/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Simplify jasmine.yml since we're using jasmine-rails gem	Robert Speicher	2015-04-18	1	-30/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A lot of these values are handled by the asset pipeline.
\| * \| \| \| \| \| \| \| \|	Make StatGraph JS explicitly require its dependencies	Robert Speicher	2015-04-18	5	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows us to test them in a bit more isolation.
\| * \| \| \| \| \| \| \| \|	rails g jasmine_rails:install	Robert Speicher	2015-04-18	2	-115/+42
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add jasmine-rails gem	Robert Speicher	2015-04-18	2	-0/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Re-run rails g jasmine:install	Robert Speicher	2015-04-18	2	-4/+56
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update jasmine gem	Robert Speicher	2015-04-18	2	-7/+7
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix 'merge_reuests' typo	Robert Speicher	2015-04-18	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'update_slack_doc' into 'master'	Job van der Voort	2015-04-22	1	-3/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated Slack documentation Fixes #2234 Updated the Slack documentation to include the new fields located in the service's settings. /cc @karen See merge request !1788
\| * \| \| \| \| \| \| \| \|	Updated the Slack documentation	Patricio Cano	2015-04-21	1	-3/+8
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-2257' into 'master'	Dmitriy Zaporozhets	2015-04-22	2	-4/+18
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Recover from URI::Error `URI::Error` is the base class for all URI errors. Fixes #2257 and #2260 See merge request !1789
\| * \| \| \| \| \| \| \| \| \|	Recover from all `URI::Error`s	Robert Speicher	2015-04-21	2	-4/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2257 Fixes #2260
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'missing-upgrade-doc' into 'master'	Marin Jankovski	2015-04-22	1	-0/+118
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add 7.9-7.10 upgrade doc See merge request !560
\| * \| \| \| \| \| \| \| \| \| \|	add 7.9-7.10 upgrade doc	Job van der Voort	2015-04-22	1	-0/+118
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-04-22	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'update_grack' into 'master'	Dmitriy Zaporozhets	2015-04-22	2	-4/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-grack to 2.0.2. Updating to grack version 2.0.2 to fix an issue with smart http clients. See merge request !559
\| \| * \| \| \| \| \| \| \| \| \| \|	Update gitlab-grack to 2.0.2.	Marin Jankovski	2015-04-22	2	-4/+4
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #8831 from bladealslayer/fix/api-user-tests	Nihad Abbasov	2015-04-22	1	-4/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix user API tests succeeding for the wrong reason
\| * \| \| \| \| \| \| \| \| \| \|	Fix user API tests succeeding for the wrong reason	Boyan Tabakov	2015-04-22	1	-4/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The requests were missing multiple required attributes, while testing for single attribute missing. Added test for checking username as required attribute.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-04-22	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'rs-toggle-tab' into 'master'	Dmitriy Zaporozhets	2015-04-22	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tab behavior on MergeRequests#new Missed this one in 269aee790c48619a92f416c8555cb4623da62ca3 Prior to this fix, clicking the Commits or Changes tab when creating a new MR would reload the page instead of display the tab contents. See merge request !556
\| \| * \| \| \| \| \| \| \| \| \| \|	Fix tab behavior on MergeRequests#newrs-toggle-tab	Robert Speicher	2015-04-21	1	-2/+2
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Marin Jankovski	2015-04-22	3	-3/+5
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge pull request #9164 from dsander/fix-markdown-preview	Jeroen van Baarsen	2015-04-22	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make issue preview look like the result
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Make issue preview look like the result	Dominik Sander	2015-04-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|