Commit Graph
1151 Commits
Author SHA1 Message Date
Robert SpeicherandYorick Peterse 3b83ed2125 Merge branch '15437-fix-xss-in-issue-tracker-service' into 'master'
Prevent XSS via custom issue tracker URL

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

See merge request !1955
2016-04-25 21:55:52 +00:00
Yorick Peterse a3783cde1a Merge branch 'fix-cache-invalidations' into 'master'
Fix Error 500 due to stale cache when projects are renamed or transferred

See merge request !3865
2016-04-25 21:54:09 +02:00
Rémy CoutableandYorick Peterse 8d7c63b708 Merge branch '15470-fix-unknown-license-not-shown' into 'master'
Fix license detection to detect all license files, not only known licenses

Fixes #15470.

See merge request !3878
2016-04-25 21:53:19 +02:00
Douwe MaanandYorick Peterse 059b6edaf8 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 15:49:23 +00:00
Robert SpeicherandYorick Peterse 69821f1a01 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 10:50:27 +02:00
Rémy CoutableandYorick Peterse b255cbf396 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 10:49:31 +02:00
P.S.V.RandYorick Peterse fd4c833367 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-19 19:19:00 +02:00
Ben BodenmillerandYorick Peterse 8d1b82acf1 format merge request references properly 2016-04-19 19:18:56 +02: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
Timothy Andrew f801e2243d A new branch created for a confidential issue is named <id>-confidential-issue. 2016-04-19 09:22:55 +05:30
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
BaldinoF b04140a1e4 Merge branch 'master' into number_sign_for_external_issue_ref 2016-04-17 18:17:27 +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
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
Timothy Andrew 91034af3c9 Augment the tests for Issue#related_branches
- Test the case where we have a referenced merge request that's being
- excluded as a "related branch"
- This took a while to figure out, especially the
  `create_cross_references!` line.
2016-04-12 15:50:19 +05:30
Baldinof 3918fce5bd Hide number sign for string prefixed external issues 2016-04-12 10:01:52 +02:00
Timothy Andrew 5d88de092f Refactor Issue#related_branches
- Previously, the controller held the logic to calculate
  related branches, which was:

  `<branches ending with `issue.iid`> - <branches with a merge request referenced in the current issue>`

- This logic belongs in the `related_branches` method, not in the
  controller. This commit makes this change.

- This means that `Issue#related_branches` now needs to take a `User`.
  When we find the branches that have a merge request referenced in the
  current issue, this is limited to merge requests that the current user
  has access to.

- This is not directly related to #14566, but is a related refactoring.
2016-04-12 11:43:15 +05:30
Robert Speicher 5ffa8f0570 Escape the query argument provided to git grep by search_files
Closes #14963.
2016-04-09 18:50:21 -04:00
Douglas Barbosa Alexandre 7afeace354 Merge branch 'master' into decouple-member-notification 2016-04-08 15:48:09 -03:00
Stan Hu 27b9f64efb Expire caches after project creation to ensure a consistent state
Closes #14961
2016-04-07 00:29:01 -07:00
Rémy Coutable e79b867d2b Ensure empty recipients are rejected in BuildsEmailService
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-06 16:14:51 +02:00
Douglas Barbosa Alexandre f2005fa566 Flush repository cache before import project data
GitHub Pull Requests importer handle with the repository while
importing data, we need to make sure that the cached values are valid.
2016-04-04 19:35:39 -03:00
Rubén Dávila e6b5716785 Migrate Repository#local_branches from gitlab-ee.
This will help us to avoid posible merge conflicts when merging
gitlab-ce to gitlab-ee
2016-04-01 14:21:08 -05:00
Rémy Coutable f9ab215b21 Merge branch 'error-when-ldap-doesn-t-supply-an-email-address-14559' into 'master'
Allow temp-oauth-email as notification email

Closes #14559 

/cc @dblessing @rymai 

See merge request !3477
2016-04-01 14:12:42 +00:00
connorshea 85cc172959 Remove "Congratulations!" tweet button on newly-created project.
I’ve removed everything related to the feature based on this commit:
ce08f919f34fd8849834365

Resolves #10857.
2016-03-31 17:09:36 -06:00
Zeger-Jan van de Weg 1e7116b34d Exclude projects pending deletion from all results 2016-03-31 20:20:18 +02:00
Zeger-Jan van de Weg 2c6207135e Allow temp-oauth-email as notification email 2016-03-31 19:59:19 +02:00
Rémy Coutable 95c7aa62de Merge branch 'fix-todos' into 'master'
Destroy related todos when an Issue/MR is deleted

Closes #14550 

Closes #14598

See merge request !3376
2016-03-31 16:43:12 +00:00
Yorick Peterse 84764847f7 Merge branch 'reorder-project-expire-cache' into 'master'
Expire the exists cache before deletion to ensure project dir actually exists

See merge request !3413
2016-03-30 22:51:36 +00:00
Zeger-Jan van de Weg 4b1ad75ab5 minor cleanup in system_hook_spec 2016-03-30 20:00:57 +02:00
Douglas Barbosa Alexandre 9b93f8adc8 Destroy related todos when an issue is deleted 2016-03-30 12:09:34 -03:00
Dmitriy Zaporozhets 630c86a7a3 Add spec for user_id uniq in NotificationSetting model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00