Commit Graph
29410 Commits
Author SHA1 Message Date
Phil Hughes d5afb1324f Sends correct parameter to commit_author_link for avatar 2016-06-08 10:11:44 +01:00
Phil Hughes 97cee7e231 Improved spacing on mobile 2016-06-08 10:11:44 +01:00
Phil Hughes 48726e9d30 Updated failing tests 2016-06-08 10:10:51 +01:00
Phil Hughes 8b40a7745b Updated tests 2016-06-08 10:10:18 +01:00
Phil Hughes 79b375e178 Updated some commit UI colors
Fixed issue with tree view styles
2016-06-08 10:10:18 +01:00
Phil Hughes 8827eea864 Updated commits UI
Closes #14633
2016-06-08 10:10:18 +01:00
Jacob Schatz 915ad255cd Merge branch '18080-project-header-alignment' into 'master'
Add flexbox to project header

## What does this MR do?
Adds flexbox to project header to keep components vertically centered regardless of description presence/length

## What are the relevant issue numbers?
Closes  #18080 

## Screenshots (if relevant)
![Screen_Shot_2016-06-01_at_12.02.42_PM](/uploads/edd769110b52ec34046f4079619e45eb/Screen_Shot_2016-06-01_at_12.02.42_PM.png)     
![Screen_Shot_2016-06-01_at_12.02.35_PM](/uploads/c5c2828ba5688a2588d3721a2d21d5fe/Screen_Shot_2016-06-01_at_12.02.35_PM.png)

See merge request !4417
2016-06-08 03:39:59 +00:00
Jacob Schatz 402767e0f5 Merge branch '18074-cancel-pipeline-text' into 'master'
Change color of canceled ci text to gray

## What does this MR do?
Change text color of Canceled builds from `$gl-danger` to `$gl-gray`

## What are the relevant issue numbers?
Closes #18074 

## Screenshots (if relevant)
<img src="/uploads/f2ac59c5081c31cfb34bdc0470e31384/Screen_Shot_2016-06-01_at_10.38.17_AM.png" width="600px">

See merge request !4412
2016-06-08 03:39:48 +00:00
Robert Speicher 703026c03e Merge branch 'bump-recaptcha-gem' into 'master'
Bump recaptcha gem to 3.0.0 to remove deprecated stoken support

Google deprecated the use of stoken in its reCAPTCHA, so this gem is
necessary to make things work again.

Closes #18210 

See merge request !4484
2016-06-07 21:38:04 +00:00
Robert Speicher fd248392dd Merge branch 'optimise-email-css' into 'master'
Optimise email CSS for speed with Premailer

Speed up emails-on-push by removing all descendant selectors from the
CSS they use, which can make the CSS inlining much more efficient in
certain cases.

See: https://gitlab.com/gitlab-org/gitlab-ee/issues/490

See merge request !4511
2016-06-07 20:42:52 +00:00
Robert Speicher 4531b5da64 Merge branch 'upgrade-nokogiri' into 'master'
Bump nokogiri to 1.6.8

Number of important security and bug fixes. See:
https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06

See merge request !4500
2016-06-07 20:36:54 +00:00
Stan Hu 405d752b9b Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
Closes #18210
2016-06-07 13:32:29 -07:00
Stan Hu 2cbb17da31 Merge branch 'load-knapsack-if-defined' into 'master'
Load knapsack in Rakefile only when is bundled

Fixes `production` builds: https://dev.gitlab.org/gitlab/omnibus-gitlab/builds/85407

cc @marin 

See merge request !4514
2016-06-07 18:37:38 +00:00
Jacob Schatz babf20c8ab Merge branch 'notification-dropdown-labels' into 'master'
Notifications dropdown on project page now has descriptions

## What does this MR do?

Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense.

## What are the relevant issue numbers?

Part of #12758

## Screenshots (if relevant)

![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png)

See merge request !4374
2016-06-07 18:06:37 +00:00
Kamil Trzcinski 88b0a9efc4 Load knapsack in Rakefile only when is bundled 2016-06-07 20:02:03 +02:00
Stan Hu 40b17bdebd Merge branch 'add-license-finder-to-contributing' into 'master'
Add License Finder information to contribution acceptance criteria.

To make it clear what should be done when the license finder test fails.

cc: @stanhu 

See merge request !4512
2016-06-07 17:41:21 +00:00
Connor Shea 629b4e68e8 Add License Finder information to contribution acceptance criteria. 2016-06-07 11:23:26 -06:00
Stan Hu 5bb3e1934c Add LGPLv2 to license whiltelist 2016-06-07 10:14:18 -07:00
Jacob Schatz c3ce61ba41 Merge branch '18058-sub-nav' into 'master'
Sub navigation

## What does this MR do?
Styles sub nav   
cc @dzaporozhets  @skyruler @jschatz1 

## What are the relevant issue numbers?
#18058 and #17983 

## Screenshots (if relevant)
![Screen_Shot_2016-06-03_at_12.10.26_PM](/uploads/8b948c32699a93ab0a390bda31e0e411/Screen_Shot_2016-06-03_at_12.10.26_PM.png)
![Screen_Shot_2016-06-03_at_12.10.34_PM](/uploads/241115c35d0618f3de739be9a670416d/Screen_Shot_2016-06-03_at_12.10.34_PM.png)

See merge request !4468
2016-06-07 17:13:21 +00:00
Jacob Schatz 7d315aecfb Merge branch '18013-compact-sidebar' into 'master'
Implement compact side nav

## What does this MR do?
Implements new compact nav design   
Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268)

## What are the relevant issue numbers?
Closes #18013 

## Screenshots (if relevant)
![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png)   
![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png)

cc @dzaporozhets 

See merge request !4447
2016-06-07 17:00:44 +00:00
Yorick Peterse 99913b3d2c Merge branch '18082-instrument-repositorycheck-singlerepositoryworker-manually' into 'master'
Instrument `RepositoryCheck::SingleRepositoryWorker` manually

See merge request !4446
2016-06-07 16:56:01 +00:00
Alejandro Rodríguez d485ec9f1c Instrument RepositoryCheck::SingleRepositoryWorker manually
This worker is called manually by `RepositoryCheck::BatchWorker` meaning it's not tracked automatically by the Sidekiq middleware.
2016-06-07 12:10:55 -04:00
Rémy Coutable be78a556d9 Merge branch 'refactor/ci-config-add-facade' into 'master'
Add new GitLab CI configuration facade class

## What does this MR do?

This MR is a first iteration of major CI configuration refactoring. See #17139 and #15060 for more details.

## What are the relevant issue numbers?

Closes #17139

See merge request !4462
2016-06-07 16:05:26 +00:00
Stan Hu 8e41b21db1 Bump nokogiri to 1.6.8
Number of important security and bug fixes. See:
https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06
2016-06-07 08:50:17 -07:00
Jacob Schatz 5b83abcc01 Merge branch 'issue_14189' into 'master'
Ability to prioritize labels

Closes #14189 

See merge request !4009
2016-06-07 15:15:07 +00:00
Kamil Trzciński 25370fd158 Merge branch 'knapsack-for-master' into 'master'
Fix knapsack for master

It were mistakenly to invoke `rspec` where it should invoke `spinach`.


See merge request !4510
2016-06-07 15:09:35 +00:00
Annabel Dunstone ae6591081a Fix alignment of wiki top area 2016-06-07 10:05:10 -05:00
Annabel Dunstone ef37b57f1f Update charcoal theme colors 2016-06-07 09:16:59 -05:00
Annabel Dunstone 2293100d95 Update nav link font size and spacing; fix hamburger icon 2016-06-07 09:16:59 -05:00
Annabel Dunstone e8a0cafc7d Fix control btn position 2016-06-07 09:16:59 -05:00
Annabel Dunstone ca985283b4 Remove todos count tests in nav 2016-06-07 09:16:59 -05:00
Annabel Dunstone ffbd9cd02d Test impersonation using img data attribute instead of username 2016-06-07 09:16:59 -05:00
Annabel Dunstone 7c501895a3 Implement compact side nav 2016-06-07 09:16:59 -05:00
Kamil Trzcinski 8cb00a97ec Fix knapsack for master 2016-06-07 16:16:39 +02:00
Annabel Dunstone 04dba0e5f8 Align links and tabs 2016-06-07 09:08:15 -05:00
Annabel Dunstone a528b649bf Add scrolling tabs to code subnav 2016-06-07 09:08:15 -05:00
Annabel Dunstone 5db95f5e69 Finish styling sub nav 2016-06-07 09:08:15 -05:00
Phil Hughes f62df363b5 Updated colors 2016-06-07 15:02:00 +01:00
Phil Hughes 51a62fce04 Fixed failing tests 2016-06-07 15:02:00 +01:00
Phil Hughes 8fa8cba02e CHANGELOG item 2016-06-07 15:02:00 +01:00
Phil Hughes e141a1c6f1 Notifications dropdown on project page now has descriptions
This is part of #12758
2016-06-07 15:02:00 +01:00
Annabel Dunstone 664afebbe9 Start styling sub nav 2016-06-07 08:59:40 -05:00
Douwe Maan 3fd0b364ea Merge branch 'knapsack' into 'master'
Use Knapsack to evenly distribute specs

Try to distribute all tests evenly accross all nodes to reduce the testing time of GitLab CE.

This uses high amount of auto-scaled machines.


See merge request !4240
2016-06-07 13:44:06 +00:00
Kamil Trzcinski 12dd7bd7e5 Remove stage notifications [ci skip] 2016-06-07 15:42:12 +02:00
Yorick Peterse 981829f3de Merge branch '89-guides' into 'master'
Added 8.9 install/update guides

See merge request !4507
2016-06-07 13:22:09 +00:00
Yorick Peterse b5464726aa Added 8.9 install/update guides
[ci skip]
2016-06-07 15:20:40 +02:00
Kamil Trzcinski ca05ea6b73 Remove knapsack_merger since we don't use it anyway 2016-06-07 15:15:32 +02:00
Sean McGivern ee26c3cab4 Fix label order by priority on labels page 2016-06-07 14:01:30 +01:00
Jacob Vosmaer (GitLab) afa21054fa Merge branch 'zj-workhorse-to-serve-diffs' into 'master'
Workhorse to serve raw diffs

Fixes (partially) #13999

Dependent on: gitlab-org/gitlab-workhorse!45

See merge request !4130
2016-06-07 12:50:29 +00:00
Douwe Maan 8c356ac550 Merge branch 'rename-ci-commit-phase-3' into 'master'
Rename ci_commit in application code

This is third iteration of renaming `[ci_]commit(s)` in application code to `pipeline(s)`.


See merge request !4464
2016-06-07 12:47:25 +00:00