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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \|	Merge branch 'fix-raw-sql-migrations' into 'master'	Stan Hu	2016-04-11	4	-12/+18
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix more SQL migrations to use raw commands gitlab-org/gitlab-development-kit#109 See merge request !3640
\| * \| \| \| \| \| \| \| \|	Fix more SQL migrations to use raw commands	Stan Hu	2016-04-10	4	-12/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab-org/gitlab-development-kit#109
* \| \| \| \| \| \| \| \| \|	Merge branch 'upgrade-annotate' into 'master'	Robert Speicher	2016-04-11	2	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade annotate from 2.6.10 to 2.7.0 We don’t have any tests for this, so no need to run them. [ci skip] Includes compatibility with Rails 5. Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286. See merge request !3645
\| * \| \| \| \| \| \| \| \| \|	Upgrade annotate from 2.6.10 to 2.7.0	connorshea	2016-04-10	2	-4/+4
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes compatibility with Rails 5. We don’t have any tests for this, so no need to run them. [ci skip] Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286.
* \| \| \| \| \| \| \| \| \|	Merge branch 'upgrade-premailer-rails' into 'master'	Robert Speicher	2016-04-11	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade premailer-rails from 1.9.0 to 1.9.2 Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v192 Working towards #14286. See merge request !3643
\| * \| \| \| \| \| \| \| \| \|	Upgrade premailer-rails from 1.9.0 to 1.9.2	connorshea	2016-04-10	1	-3/+3
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19 2 Working towards #14286.
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-milestone-seedfu' into 'master'	Robert Speicher	2016-04-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix seed_fu failure with inserting milestones into test DB Milestones were not being saved due to "invalid state" validation errors See merge request !3641
\| * \| \| \| \| \| \| \| \| \|	Fix seed_fu failure with inserting milestones into test DB	Stan Hu	2016-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Milestones were not being saved due to "invalid state" validation errors
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue_14353' into 'master'	Jacob Schatz	2016-04-11	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore toggling the sidebar for resolutions over 1200px width Closes #14353 ![sidebar1](/uploads/4b8d0eaa1b320c319239cb572932f740/sidebar1.gif) See merge request !3547
\| * \| \| \| \| \| \| \| \| \| \|	Use existence operator insteadissue_14353	Alfredo Sumaran	2016-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Check existence of variable method	Alfredo Sumaran	2016-04-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.
\| * \| \| \| \| \| \| \| \| \| \|	Ignore toggling sidebar for above 1200px resolution	Alfredo Sumaran	2016-04-10	1	-1/+2
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master'	Jacob Schatz	2016-04-11	3	-3/+78
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prevent users from being able to both upvote and downvote See merge request !3495
\| * \| \| \| \| \| \| \| \| \|	write test to prevent reoccurence of issueprevent_users_from_upvoting_downvoting_emoji	Arinde Eniola	2016-04-09	1	-0/+64
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	prevent users from being able to both upvote and downvote	Arinde Eniola	2016-04-09	2	-3/+14
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-markdown-preview-tabindex' into 'master'	Jacob Schatz	2016-04-10	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove tab stop from "Write", "Preview", "Go full screen" links Closes #15089 See merge request !3635
\| * \| \| \| \| \| \| \| \| \|	Remove tab stop from "Write", "Preview", "Go full screen" linksrs-markdown-preview-tabindex	Robert Speicher	2016-04-09	1	-3/+3
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #15089
* \| \| \| \| \| \| \| \| \|	Merge branch 'redesign_labels_page' into 'master'	Jacob Schatz	2016-04-10	6	-11/+74
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Redesign labels page closes #14227 ## Desktop ![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png) ## Mobile ![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png) See merge request !3507
\| * \| \| \| \| \| \| \| \|	apply some css changesredesign_labels_page	Arinde Eniola	2016-04-06	1	-4/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	fix the failing tests and some changes	Arinde Eniola	2016-04-06	4	-14/+18
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	finish up the design and add info to the changelog	Arinde Eniola	2016-04-06	4	-8/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	make the view responsive for extra small device	Arinde Eniola	2016-04-06	1	-0/+20
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	set the width to the elements	Arinde Eniola	2016-04-06	1	-2/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	change the subscribe, delete and edit buttons to icons	Arinde Eniola	2016-04-06	3	-8/+42
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'project-services-page-should-contain-full-info' into 'master'	Achilleas Pipinellis	2016-04-10	2	-15/+21
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Everything on one page. See merge request !3636
\| * \| \| \| \| \| \| \| \| \|	Everything on one page.project-services-page-should-contain-full-info	Sytse Sijbrandij	2016-04-09	2	-15/+21
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-project-last-activity-at-migration' into 'master'	Robert Speicher	2016-04-10	1	-7/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use raw SQL instead of Rails models in 20130403003950 migration Closes gitlab-org/gitlab-development-kit#109 Closes https://github.com/gitlabhq/gitlabhq/issues/10123 See merge request !3638
\| * \| \| \| \| \| \| \| \| \|	Use raw SQL instead of Rails models in 20130403003950 migration	Stan Hu	2016-04-09	1	-7/+9
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitlab-org/gitlab-development-kit#109 Closes https://github.com/gitlabhq/gitlabhq/issues/10123
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-sidekiq-sentry-context' into 'master'	Stan Hu	2016-04-10	1	-0/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a `sidekiq` tag to Sentry Raven context This will let us filter errors that were/were not in the Sidekiq environment. Source: http://stackoverflow.com/a/28370539/223897 Closes #15092 See merge request !3634
\| * \| \| \| \| \| \| \| \|	Add a `program` tag to Sentry Raven contextrs-sidekiq-sentry-context	Robert Speicher	2016-04-09	1	-0/+10
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will let us filter errors by the program environment in which they were encountered. Source: http://stackoverflow.com/a/28370539/223897 Closes #15092
* \| \| \| \| \| \| \| \|	Merge branch 'enable-compress-in-production' into 'master'	Robert Speicher	2016-04-09	2	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable asset compression in production. `config.assets.compress` needed to be explicitly enabled. Follow-up to !3544. Resolves #14344. See merge request !3632
\| * \| \| \| \| \| \| \|	Enable asset compression in production.	connorshea	2016-04-09	2	-0/+4
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`config.assets.compress` needed to be explicitly enabled. Follow-up to !3544. Resolves #14344.
* \| \| \| \| \| \| \|	Merge branch '14400-diff-redesign' into 'master'	Jacob Schatz	2016-04-09	19	-74/+119
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Diff redesign Fixes #14400 Fixes #13500 ![diffs_redesign](/uploads/16da9557e497114d886ef5ece2f306b3/diffs_redesign.gif) See merge request !3476
\| * \| \| \| \| \| \|	Remove comment count & icon from side by side view14400-diff-redesign	Annabel Dunstone	2016-04-07	1	-6/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Diff touch ups	Annabel Dunstone	2016-04-07	5	-11/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix lint errors	Annabel Dunstone	2016-04-07	3	-8/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Remove comment count & icon	Annabel Dunstone	2016-04-07	1	-3/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Diff design updates	Annabel Dunstone	2016-04-07	15	-67/+90
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge conflict fixes	Annabel Dunstone	2016-04-07	1	-15/+15
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update diff_comments tests	Annabel Dunstone	2016-04-07	2	-5/+5
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update diff colors and icons	Annabel Dunstone	2016-04-07	7	-15/+29
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Move diff colors to variables	Annabel Dunstone	2016-04-07	3	-14/+24
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Change reply button to text field	Annabel Dunstone	2016-04-07	2	-7/+19
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'upgrade-sprockets' into 'master'	Robert Speicher	2016-04-09	2	-3/+4
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update sprockets to 3.6.0 Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Closes #14344. See merge request !3544
\| * \| \| \| \| \| \| \|	Upgrade Sprockets from 3.3.5 to 3.6.0.	connorshea	2016-04-09	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sprockets 3.5.0 reintroduces GZIP-ing and 3.6.0 includes performance improvements. Changelog: https://github.com/rails/sprockets/blob/3.x/CHANGELOG.md Resolves #14344.
* \| \| \| \| \| \| \| \|	Merge branch 'schema-remove-twitter-sharing' into 'master'	Robert Speicher	2016-04-09	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure schema version matches latest migration From commit 85cc1729596ac1e5b31d8cfa1daa07477db6033d See merge request !3627
\| * \| \| \| \| \| \| \|	Apparently I missed updating the schema.rb when removing the Twitter ↵	connorshea	2016-04-09	1	-2/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"Congrats" button From commit 85cc1729596ac1e5b31d8cfa1daa07477db6033d
* \| \| \| \| \| \| \|	Minor Testing guide copyedits	Robert Speicher	2016-04-09	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'rs-update-rails' into 'master'	Robert Speicher	2016-04-09	3	-37/+38
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump rails to 4.2.6 See merge request !3424
\| * \| \| \| \| \| \| \|	Bump rails to 4.2.6rs-update-rails	Robert Speicher	2016-04-05	3	-37/+38
\| \| \| \| \| \| \| \| \|