Commit Graph
29384 Commits
Author SHA1 Message Date
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
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
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
Douwe Maan 3368afd767 Merge branch 'rename-ci-commit-phase-2' into 'master'
Rename Ci::Commit in specs

This is second iteration of renaming Ci::Commit occurences, this time I try to rename all `let's` and `factories` to match what type of object is created:

1. Rename factories: `ci_[...]_commit_[...]` to `ci_[...]_pipeline_[...]`,
2. Rename all `let's(:[ci_]commit)` to `let(:pipeline)`,
3. Rename all occurrences of `[ci_]commit` to `pipeline` if Pipeline object is created

cc @grzesiek @DouweM 

See merge request !4463
2016-06-07 12:45:59 +00:00
Kamil Trzcinski 59376bb360 Fix knapsack spinach execution 2016-06-07 14:35:17 +02:00
Kamil Trzcinski b0eb4cb4a7 Rename @ci_commit to @pipeline in MergeRequestController 2016-06-07 13:19:15 +02:00
Kamil Trzcinski 93eb844d7e Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 2016-06-07 13:15:29 +02:00
Kamil Trzcinski 8988c8743d Fix remaining test offenses 2016-06-07 13:14:37 +02:00
Kamil Trzcinski 9b76bb30e8 Fix .gitlab-ci.yml 2016-06-07 13:10:40 +02:00
Douwe Maan 8c5712a422 Merge branch 'gh-disable-webhooks' 2016-06-07 13:06:43 +02:00
Kamil Trzcinski 03a7569ea6 Rerun failed spinach tests 2016-06-07 13:06:24 +02:00
Douwe Maan acef028d85 Merge branch 'gh-fix-comments-on-diff' 2016-06-07 13:04:32 +02:00
Douwe Maan affd58fb79 Merge branch 'gh-rate-limit' 2016-06-07 12:59:52 +02:00
Grzegorz Bizon 5ef104df59 Improve Ci config loader by changing method signature 2016-06-07 12:53:46 +02:00
Kamil Trzcinski 498f8d13d0 Fix license_finder 2016-06-07 11:23:53 +02:00
Kamil Trzcinski 0f97357145 Install knapsack 2016-06-07 10:45:02 +02:00
Kamil Trzcinski b09a329fd8 Use ruby:2.1 and ruby:2.2 images 2016-06-07 10:31:02 +02:00
Kamil Trzcinski 0b4981e771 Merge remote-tracking branch 'origin/master' into knapsack
# Conflicts:
#	.gitlab-ci.yml
2016-06-07 10:29:43 +02:00
Kamil Trzcinski 9839bbae9c Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 2016-06-07 10:27:27 +02:00
Grzegorz Bizon fa097c678c Remove duplicated exception in Ci config
This is a temporary refactoring stub, that is planned to be removed
after removing legacy config processor.
2016-06-07 10:26:38 +02:00
Kamil Trzcinski 6e64d1ac76 Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 2016-06-07 10:26:27 +02:00
Kamil Trzcinski dbf235f514 Fix tests failures 2016-06-07 10:25:57 +02:00
Rémy Coutable 9e256de4ac Merge branch 'license-finder-gem' into 'master'
License finder gem

Every time a gem is added to the Gemfile, or a gem is updated with a new dependency or change of license, LicenseFinder will check to ensure that the license in use has been whitelisted for use in the project. GPLv2 and GPLv3 libraries are not allowed to be linked-to from non-GPL projects (e.g. the MIT-licensed GitLab CE or proprietary EE), otherwise we're violating the license.

https://github.com/pivotal/LicenseFinder

See also: gitlab-com/operations#164

See merge request !3775
2016-06-07 08:06:17 +00:00
Rémy Coutable d9f1fb1640 Merge branch 'colorize-db-seed' into 'master'
Fix missed colorize methods.

Fix #18250.

cc: @twk3 

See merge request !4495
2016-06-07 06:47:56 +00:00
Stan Hu 48cf8e49ef Merge branch 'bump-rouge' into 'master'
Bump rouge to 1.11.0

See: https://github.com/jneen/rouge/blob/master/CHANGELOG.md

See merge request !4491
2016-06-07 03:59:45 +00:00
Stan Hu 8f28dc950a Bump rouge to 1.11.0 2016-06-06 20:55:37 -07:00