Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq (5812cfa1) · Commits · Adri / Gitlab-External-Templates · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Gitlab-External-Templates
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5812cfa1

Commit 5812cfa1 authored 10 years ago by

Jacob Vosmaer

Downloads
- Plain Diff

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

Conflicts:
	VERSION

parents 779747c1 87efd92d

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

Gemfile.lock 7 additions, 7 deletions

Gemfile.lock
VERSION 1 addition, 1 deletion

VERSION
app/models/concerns/issuable.rb 4 additions, 0 deletions

app/models/concerns/issuable.rb
app/models/label.rb 2 additions, 2 deletions

app/models/label.rb
doc/integration/google.md 9 additions, 5 deletions

doc/integration/google.md
doc/update/6.0-to-7.2.md 8 additions, 2 deletions

doc/update/6.0-to-7.2.md
doc/update/7.1-to-7.2.md 6 additions, 0 deletions

doc/update/7.1-to-7.2.md
lib/api/helpers.rb 6 additions, 2 deletions

lib/api/helpers.rb
lib/api/issues.rb 6 additions, 5 deletions

lib/api/issues.rb
spec/models/label_spec.rb 23 additions, 0 deletions

spec/models/label_spec.rb
spec/requests/api/issues_spec.rb 50 additions, 6 deletions

spec/requests/api/issues_spec.rb
spec/requests/api/labels_spec.rb 16 additions, 0 deletions

spec/requests/api/labels_spec.rb

with 138 additions and 30 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment