Commit Graph
1170 Commits
Author SHA1 Message Date
Douwe Maan 7ded28ff99 Merge branch 'fix/label-filters' into 'master'
Filter labels by including ALL filter titles

Fixed query to use `AND` and not `OR`. Refactored relevant specs

See merge request !3815
2016-04-21 13:13:10 +00:00
James Lopez b09b175def refactored specs based on feedback 2016-04-21 13:20:00 +02:00
Kamil Trzciński d240666800 Merge branch 'ci-commit-as-pipeline' into 'master'
Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -> Pipeline
Ci::Build -> Build
CommitStatus -> Job
GenericCommitStatus -> ExternalJob

ci_commits -> pipelines
ci_builds -> jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653
2016-04-21 08:10:37 +00:00
James Lopez 6865bc16f8 refactored specs, adding more scenarios 2016-04-21 09:12:03 +02:00
James Lopez 07f8ffbdaf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filters
# Conflicts:
#	spec/features/issues/filter_by_labels_spec.rb
2016-04-21 08:37:38 +02:00
James Lopez 976593fa7f final line missing 2016-04-20 11:50:07 +02:00
James Lopez c0948396d1 fix rubocop warning 2016-04-20 11:25:33 +02:00
James Lopez af18cddddf udpated a few things based on MR feedback. Also added model spec 2016-04-20 10:56:28 +02:00
Rémy Coutable d712789054 Merge branch 'slack_wiki_notifications' into 'master'
add slack notifications for wiki pages

## What does this MR do?

Lets the Slack service be configured to send notifications when wiki pages are created or edited.

## Are there points in the code the reviewer needs to double check?

I'm just starting to get familiar with the Gitlab codebase and I was unsure on how to get the wiki page url to pass it to the slack message, on whether or not I needed to refactor the create/update methods for wiki pages from the controller to a service (but seemed necessary to test it better), and if I needed to add a column to the web hooks table or if the services table would have been enough. Please let me know if I should change anything and I will improve the MR, thanks for checking :)

## Why was this MR needed?

Related to #563 and fixes #4233.



See merge request !2998
2016-04-20 08:12:48 +00:00
Robert Speicher 3d4875f86a Merge branch 'license-templates-and-api-12804' into 'master'
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
2016-04-20 01:38:49 +00:00
Sebastian Klier 26df51dc2e Fix test to conform to conventions 2016-04-20 08:25:41 +08:00
Sebastian Klier 39a545d2a8 Fix test 2016-04-20 08:25:41 +08:00
Sebastian Klier d472810e49 formatting and test structure 2016-04-20 08:25:41 +08:00
Sebastian Klier 54661d3d44 add slack notifications for wiki pages
update changelog
2016-04-20 08:25:40 +08:00
Kamil Trzcinski 27e0c7723c Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline
# Conflicts:
#	db/schema.rb
2016-04-19 14:00:14 -04:00
Douwe Maan 55380e69fc Merge branch 'pmq20/gitlab-ce-issue_12785' 2016-04-19 18:25:42 +02:00
Robert Speicher 7b09bab68e Merge branch 'mr-formatting' into 'master'
use ! rather than # for merge request references

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278

See merge request !3740
2016-04-19 16:23:41 +00:00
Robert Speicher 18a8844fa0 Merge branch '14566-confidential-issue-branches' into 'master'
Sanitize branch names for confidential issues

- When creating new branches for confidential issues, prefer a branch name like `issue-15` to `some-sensitive-issue-title-15`.
- The behaviour for non-confidential issues stays the same.

Closes #14566

See merge request !3671
2016-04-19 16:15:50 +00:00
Ben Bodenmiller b68e3925ff format merge request references properly 2016-04-18 23:32:02 -07:00
Timothy Andrew f801e2243d A new branch created for a confidential issue is named <id>-confidential-issue. 2016-04-19 09:22:55 +05:30
Rémy Coutable 13804aba86 Continue implementation of the license template selector and /licenses API endpoint
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18 14:47:50 +02:00
Kamil Trzcinski e5ff37c1fc Fix rubocop 2016-04-18 07:45:23 -04:00
Kamil Trzcinski 28ce41c00e Fix tests 2016-04-18 07:35:43 -04:00
Grzegorz Bizon a6260b1eb7 Remove code that removes duplicate CI variables
At this point this is being handled by GitLab Runner and we need to
introduce this as a separate merge request.
2016-04-18 13:17:48 +02:00
Grzegorz Bizon bdb06fa043 Improve build specs for job environment variables 2016-04-18 13:17:48 +02:00
Grzegorz Bizon b7946b50fc Read job variables directly from gitlab CI config 2016-04-18 13:17:48 +02:00
Grzegorz Bizon b578fbfb85 Make it possible to override build variables 2016-04-18 13:17:47 +02:00
Grzegorz Bizon a1363d39c6 Add variables keyword to job in CI config YAML 2016-04-18 13:17:47 +02:00
Yorick Peterse 651c3e841d Instrument Repository.clean_old_archives 2016-04-18 12:33:11 +02:00
P.S.V.R 3d6ba3b107 Add support to cherry-pick any commit
Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
2016-04-18 15:39:07 +08:00
BaldinoF b04140a1e4 Merge branch 'master' into number_sign_for_external_issue_ref 2016-04-17 18:17:27 +02:00
Kamil Trzcinski 1c5b172abb Write specs for this feature 2016-04-16 22:43:40 +02:00
Kamil Trzcinski 0b1655e7b2 Rename CiStatus to Statusable 2016-04-16 21:46:26 +02:00
Kamil Trzcinski 065e0c0fe4 Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline
# Conflicts:
#	db/schema.rb
2016-04-16 19:55:14 +02:00
Robert Schilling 3c704c33e0 Delete tags via rugged 2016-04-15 16:05:04 +02:00
Douwe Maan 447a905088 Merge branch 'rs-trailing-slash-in-search' into 'master'
Escape the query argument provided to `git grep` by `search_files`

Closes #14963.

See merge request !3633
2016-04-15 06:46:47 +00:00
Timothy Andrew 953bafff90 Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-branches 2016-04-15 09:50:53 +05:30
Timothy Andrew f5ce601c2b Make a few style changes based on MR feedback. 2016-04-15 09:31:26 +05:30
Rémy Coutable 64776ab2b4 Merge branch 'start-with-iid-on-new-branch' into 'master'
Start with iid on branch creation

After the discussion it in #3886 it was decided the iid should be in the beginning of the branch name.

See merge request !3708
2016-04-14 13:41:30 +00:00
Zeger-Jan van de Weg 0385cd5a58 Start with iid on branch creation 2016-04-14 14:49:45 +02:00
Frank Groeneveld 2fd05aed46 Allow empty recipient list when pusher is added
Closes #13574
2016-04-14 10:24:09 +02:00
Robert Speicher 0b447a9977 Merge branch 'fix-trailing-slash-in-bamboo_url' into 'master'
Fix a bug with trailing slash in bamboo_url

Also, improve specs for BambooService

Similar to !3679.

See merge request !3680
2016-04-13 16:18:46 +00:00
Robert Speicher 6020602359 Merge branch 'fix-trailing-slash-in-teamcity_url-3515' into 'master'
Fix trailing slash in teamcity_url

Originally opened at !2309 by @ctmay4.

As described in #3515, if you have trailing spaces in the the Teamcity server name, the service
will not work properly.  Switching from `URI.parse` to `URI.join` fixes it so that it works with
or without a trailing slash.

Fixes #3515.

See merge request !3679
2016-04-13 16:17:39 +00:00
Rémy Coutable acf911eeae Fix a bug with trailing slash in bamboo_url
Also, improve specs for BambooService

Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-13 15:58:14 +02:00
Kamil Trzcinski 4af0968c43 Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline 2016-04-13 15:47:18 +02:00
Rémy Coutable 3ea955a637 Improve TeamcityService and its specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-13 10:01:49 +02:00
Stan Hu 2ce7559d70 Fix repository cache invalidation issue when project is recreated with an empty repo
To reproduce:

1. Create a project with some content
2. Rename the project
3. Create a new project with the same name.
4. Boom - 404.

After step 2, the branch and tag counts were not being cleared. This would
cause `repository.has_visible_content?` to erroneously return `true`
for the newly-created project.

Closes #13384
2016-04-13 00:04:17 -07:00
Timothy Andrew c4393a10d7 Merge remote-tracking branch 'origin/master' into 14566-confidential-issue-branches 2016-04-13 09:20:25 +05:30
Timothy Andrew 8dd1a6fc91 Fix the rubocop check. 2016-04-13 09:04:08 +05:30
Timothy Andrew 66ca80181b Test the Issue#to_branch_name method. 2016-04-12 16:01:44 +05:30