Commit Graph
29336 Commits
Author SHA1 Message Date
Lin Jen-Shin 4f34cf3241 Add a blank line between before and it:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12301563
2016-06-07 22:34:09 +08:00
Lin Jen-Shin 4fcdcc36f1 Avoid using subject and is_expected.to:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12274602
2016-06-07 22:34:09 +08:00
Lin Jen-Shin 5f3e647330 Prefer do and end for before/after:
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12217415
2016-06-07 22:34:09 +08:00
Lin Jen-Shin db95704fb4 Fix method definition style 2016-06-07 22:34:09 +08:00
Lin Jen-Shin 2dd60b9b3f Use rspec's matchers and update style:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12194552
2016-06-07 22:34:09 +08:00
Lin Jen-Shin 0c2962eb86 Use subject for more consistent testing style:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12194489
2016-06-07 22:34:09 +08:00
Lin Jen-Shin 5360ef2c5b This is easier to write:
Feedback from:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4404#note_12194471
2016-06-07 22:34:09 +08:00
Lin Jen-Shin e8cf89fa06 Add a test for User#ci_authorized_runners 2016-06-07 22:34:09 +08: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
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
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
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
Robert Speicher 1386013abd Merge branch '18254-use-better_errors-editor-links-in-sherlock' into 'master'
Use better_errors editor links in sherlock

Closes #18254. Uses the same editor configuration of `better_errors`
so that you don't have to configure things twice. Remember to have a
custom initializer that specifies your editor.

Example for atom. File `config/initializers/better_errors.rb`:
````ruby
if defined?(BetterErrors)
  BetterErrors.editor = "atm://open?url=file://%{file}&line=%{line}"
end
````

See merge request !4497
2016-06-07 02:02:23 +00:00
Alejandro Rodríguez fbd2169f99 Use better_errors editor links in sherlock
Remember to configure your `better_errors` editor to point to your program of preference
2016-06-06 18:27:26 -04:00
Connor Shea efb7da68e6 Fix missed colorize methods. 2016-06-06 15:32:36 -06:00
Jacob Schatz 740a6ecba0 Merge branch 'wiki-bottom-padding' into 'master'
Add padding to bottom of wiki page, fix #12921.

## What does this MR do?
Adds padding to the bottom of the wiki page so it's not right up against the edge of the browser window.

## What are the relevant issue numbers?
#12921

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-06_at_12.21.22_PM](/uploads/9710682a57f5e521253f17a65f896f4d/Screen_Shot_2016-06-06_at_12.21.22_PM.png)

After:

![Screen_Shot_2016-06-06_at_12.20.50_PM](/uploads/002068b072050e0f8146757a0386d30f/Screen_Shot_2016-06-06_at_12.20.50_PM.png)

cc: @jschatz1 

See merge request !4490
2016-06-06 20:29:12 +00:00
Connor Shea 7900c035bf Resolve feedback. 2016-06-06 13:39:36 -06:00
Connor Shea b2e85b7968 Add relevant commands to the licensing document, resolve some feedback. 2016-06-06 13:39:36 -06:00
Connor Shea 7045b9e908 Make sure to mention the GNU Project and OSI-provided information regarding the GPL so no one tries to disagree with that decision. 2016-06-06 13:39:36 -06:00
Connor Shea 3c32341215 Add Licensing information and guidelines to the Documentation. 2016-06-06 13:39:36 -06:00
Connor Shea 4cff270f20 Fix up all the decisions in the YML file. 2016-06-06 13:39:36 -06:00
Connor Shea ddca2806c7 Add gems and licenses that were previously missing. Approve a number of licenses after a bunch of research today. 2016-06-06 13:39:36 -06:00
Connor Shea 9442482d09 Add some gems' licenses not caught by License Finder.
Also add License Finder to CI (only runs on master).
2016-06-06 13:39:36 -06:00
Connor Shea b51b14507c Add License Finder gem.
In order to rehost all our gems in our own gem host, we need to have the legal rights to do so for every gem should they be taken down from RubyGems. License Finder automates checking of gems to ensure that we're in the clear legally.

Approved the MIT License because it essentially allows us to do "whatever" with those gems.

I am not a lawyer.

https://github.com/pivotal/LicenseFinder
2016-06-06 13:39:36 -06:00
Yorick Peterse 0ba21860c5 Merge branch 'issue_3359' into 'master'
Remove duplicated notification settings and add unique index

See merge request !4472
2016-06-06 19:14:01 +00:00
Jacob Schatz f73292e471 Merge branch 'activity-links' into 'master'
Fixed issue with activity links not being consistent

## What does this MR do?

Previously, links for opening an issue/merge request & commenting where different. Opening would only have a link on the number whereas commenting would have link on the text as well. This standardises it to include the type as well (ie. issue)

## What are the relevant issue numbers?

Closes #17621 

## Screenshots (if relevant)

![Screen_Shot_2016-06-01_at_12.12.09](/uploads/c778b007e6b6c068fcae30e34409ce98/Screen_Shot_2016-06-01_at_12.12.09.png)

See merge request !4400
2016-06-06 19:07:19 +00:00