home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,495 Commits 48 Branches 340 Tags
a650af12261b850d9565cbfc473ea82db59f2e3d
Commit Graph
26495 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Hughes a650af1226 Moved loading icon to match todo loading icon 2016-04-12 09:48:39 +01:00
Phil Hughes 3cfbd2b160 Added loading icon to import buttons 
See #14488 for more details
 2016-04-11 18:27:34 +01:00
Jacob Schatz 4087bd16e8 Merge branch 'dashboard-filter-milestone' into 'master' 
Fixed issue with dashboard/issues not filtering by milestone

Closes #15128

See merge request !3650
 2016-04-11 13:56:29 +00:00
Dmitriy Zaporozhets 6a2109490c Merge branch 'complexity/descrease-abc-size-threshold' into 'master' 
Decrease threshold for ABC Size metric in Rubocop

To 55.

References #3444

See merge request !3598
 2016-04-11 13:45:37 +00:00
Yorick Peterse 15cbbd09fb Merge branch 'metrics-measure-block-transaction' into 'master' 
Store block timings as transaction values

See merge request !3649
 2016-04-11 13:16:58 +00:00
Yorick Peterse 7eed4608fe Fixed stubbing for Gitlab::Metrics specs 
If the measure method uses Transaction.current directly the SQL
subscriber (Subscribers::ActiveRecord) will add timings of queries
triggered by DB cleaner.
 2016-04-11 14:29:38 +02:00
Dmitriy Zaporozhets 5999fec7a3 Merge branch 'rs-form_errors' into 'master' 
Standardize the way we check for and display form errors

- Some views had a "Close" button. We've removed this, because we don't
  want users accidentally hiding the validation errors and not knowing
  what needs to be fixed.
- Some views used `li`, some used `p`, some used `span`. We've
  standardized on `li`.
- Some views only showed the first error. We've standardized on showing
  all of them.
- Some views added an `#error_explanation` div, which we've made
  standard.

See merge request !3531
 2016-04-11 12:01:50 +00:00
Dmitriy Zaporozhets 1794e934ce Merge branch 'rs-code-review-guide' into 'master' 
First pass at a Code Review guide

Largely borrowed from thoughtbot's code review guide, so attribution is
included.

[ci skip]

See merge request !3639
 2016-04-11 11:28:42 +00:00
Yorick Peterse d9110a7eca Track call counts in Gitlab::Metrics.measure_block 2016-04-11 13:27:52 +02:00
Jacob Schatz 69a8bf367c Merge branch 'mr-ui-update' into 'master' 
Updated UI for new merge request

Closes #2540 

![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png)

![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png)

See merge request !3228
 2016-04-11 11:25:40 +00:00
Yorick Peterse 185d78bcb3 Added specs for Gitlab::Metrics::System.cpu_time 2016-04-11 13:11:13 +02:00
Yorick Peterse 16926a676b Store block timings as transaction values 
This makes it easier to query, simplifies the code, and makes it
possible to figure out what transaction the data belongs to (simply
because it's now stored _in_ the transaction).

This new setup keeps track of both the real/wall time _and_ CPU time
spent in a block, both measured using milliseconds (to keep all units
the same).
 2016-04-11 13:09:36 +02:00
Phil Hughes 2f4dc45da2 Fixed issue with dashboard/issues not filtering by milestone 
Closes #15128
 2016-04-11 11:38:24 +01:00
Dmitriy Zaporozhets 986b4a54ee Merge branch 'rs-remove-markdown-tips' into 'master' 
Remove `random_markdown_tip` helper

Only usage got removed in !3442

See merge request !3637
 2016-04-11 10:26:36 +00:00
Achilleas Pipinellis 85279c07c9 Merge branch 'patch-1' into 'master' 
Correct documentation on enabling artifacts.

The docs say to enable artifacts that settings should be set to "false".  This updates the documents to change the setting to "true".

See merge request !3630
 2016-04-11 09:44:23 +00:00
Phil Hughes 12ff7ee933 Merge request mobile spacing 2016-04-11 09:54:32 +01:00
Phil Hughes a4fff0e033 Fixed dropdown title overlap 2016-04-11 09:52:12 +01:00
Phil Hughes 643fe43d78 Addressed feedback 
Removed important from css
 2016-04-11 09:43:59 +01:00
Grzegorz Bizon 0e8aaad510 Decrease threshold for ABC Size metric in Rubocop 
To 60.
 2016-04-11 10:27:13 +02:00
Stan Hu 78192747d3 Merge branch 'add-missing-mixin' into 'master' 
Use false/true mixin in migration from !3640



See merge request !3646
 2016-04-11 05:44:53 +00:00
Stan Hu 13c00262f7 Use false/true mixin in migration from !3640 2016-04-10 22:04:24 -07:00
Stan Hu 93cfc0b25e Merge branch 'fix-raw-sql-migrations' into 'master' 
Fix more SQL migrations to use raw commands

gitlab-org/gitlab-development-kit#109

See merge request !3640
 2016-04-11 03:51:02 +00:00
Robert Speicher ca7fa51065 Merge branch 'upgrade-annotate' into 'master' 
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
 2016-04-11 03:23:03 +00:00
Robert Speicher 0c6923e2d1 Re-add a note about sarcasm to the Code Review guide 
[ci skip]
 2016-04-10 22:54:44 -04:00
Robert Speicher 27e4dd3829 Merge branch 'upgrade-premailer-rails' into 'master' 
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
 2016-04-11 02:51:05 +00:00
Robert Speicher 636b4c6dc9 Merge branch 'fix-milestone-seedfu' into 'master' 
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
 2016-04-11 02:22:53 +00:00
Jacob Schatz 6e47f30932 Merge branch 'issue_14353' into 'master' 
Ignore toggling the sidebar for resolutions over 1200px width

Closes #14353 
![sidebar1](/uploads/4b8d0eaa1b320c319239cb572932f740/sidebar1.gif)

See merge request !3547
 2016-04-11 00:40:54 +00:00
Jacob Schatz d2c9137fea Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master' 
prevent users from being able to both upvote and downvote



See merge request !3495
 2016-04-11 00:28:12 +00:00
Alfredo SumaranandJacob Schatz 836301676a Use existence operator instead 2016-04-10 20:03:36 -04:00
Alfredo SumaranandJacob Schatz fe0aa82325 Check existence of variable method 
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.
 2016-04-10 20:03:36 -04:00
Alfredo SumaranandJacob Schatz a7c11fe473 Ignore toggling sidebar for above 1200px resolution 2016-04-10 20:03:36 -04:00
Stan Hu 3b77a07856 Fix more SQL migrations to use raw commands 
gitlab-org/gitlab-development-kit#109
 2016-04-10 15:51:45 -07:00
Benjamin Montgomery 84ff30a6b2 fix typo 2016-04-10 21:16:06 +00:00
connorshea a7e1638b43 Upgrade annotate from 2.6.10 to 2.7.0 
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.
 2016-04-10 15:14:57 -06:00
Benjamin Montgomery 1e99e56202 Make the purpose of artifact config options clearer 2016-04-10 21:14:40 +00:00
connorshea 94b48d9557 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#v19
2

Working towards #14286.
 2016-04-10 14:36:31 -06:00
Jacob Schatz 0631a1e9e2 Merge branch 'rs-markdown-preview-tabindex' into 'master' 
Remove tab stop from "Write", "Preview", "Go full screen" links

Closes #15089

See merge request !3635
 2016-04-10 14:40:52 +00:00
Jacob Schatz 283ecf6e48 Merge branch 'redesign_labels_page' into 'master' 
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
 2016-04-10 14:05:22 +00:00
Stan Hu 8536dedbb1 Fix seed_fu failure with inserting milestones into test DB 
Milestones were not being saved due to "invalid state" validation errors
 2016-04-10 06:39:42 -07:00
Achilleas Pipinellis 6ca5d6cf3c Merge branch 'project-services-page-should-contain-full-info' into 'master' 
Everything on one page.



See merge request !3636
 2016-04-10 06:49:22 +00:00
Robert Speicher 4a1ef73c85 Merge branch 'fix-project-last-activity-at-migration' into 'master' 
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
 2016-04-10 02:32:33 +00:00
Robert Speicher c7ec5929b1 First pass at a Code Review guide 
Largely borrowed from thoughtbot's code review guide, so attribution is
included.

[ci skip]
 2016-04-09 21:49:47 -04:00
Stan Hu 66102e5017 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
 2016-04-09 18:36:07 -07:00
Robert Speicher f833726ec0 Remove random_markdown_tip helper 
Only usage got removed in !3442
 2016-04-09 20:43:59 -04:00
Stan Hu dfe4c69ea8 Merge branch 'rs-sidekiq-sentry-context' into 'master' 
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
 2016-04-10 00:29:33 +00:00
Sytse Sijbrandij 98f536f169 Everything on one page. 2016-04-09 20:09:07 -04:00
Robert Speicher f03b5c4fde Remove tab stop from "Write", "Preview", "Go full screen" links 
Closes #15089
 2016-04-09 20:02:36 -04:00
Robert Speicher 2378ec0d63 Add a program tag to Sentry Raven context 
This will let us filter errors by the program environment in which they
were encountered.

Source: http://stackoverflow.com/a/28370539/223897

Closes #15092
 2016-04-09 19:57:27 -04:00
Robert Speicher a2303417d0 Merge branch 'enable-compress-in-production' into 'master' 
Enable asset compression in production.

`config.assets.compress` needed to be explicitly enabled.

Follow-up to !3544. Resolves #14344.

See merge request !3632
 2016-04-09 23:08:43 +00:00
Arinde Eniola 91905ae3f5 write test to prevent reoccurence of issue 2016-04-09 23:31:45 +01:00