delta/gitlab/gitlab-ce.git, branch improve-gitlab-flow-doc gitlab.com: gitlab-org/gitlab-ce.git Improve GitLab flow documentation regarding the WIP merge requests 2016-01-29T09:39:42+00:00 Rémy Coutable remy@rymai.me 2016-01-29T09:39:19+00:00 87d3ce88c703c0dd1a7fb99a5371466b19a461c9 [ci skip] 
[ci skip]
Merge branch 'hotfix/ruby-21-broken-update' into 'master' 2016-01-29T08:12:18+00:00 Marin Jankovski marin@gitlab.com 2016-01-29T08:12:18+00:00 9d0065f05455e1f9146ab30a3aaf903472c9b8f4 fix syntax error on 2.1 and rubocop on 2.2 Background: Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`. Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801 See merge request !2637 

fix syntax error on 2.1 and rubocop on 2.2

Background:

Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... 

We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`.

Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. 

Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place.

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

See merge request !2637
 Make changes in config/initializers/1_settings.rb 2016-01-29T01:06:21+00:00 Sytse Sijbrandij sytse@gitlab.com 2016-01-29T01:06:21+00:00 92c04ecbd7308b7ccb53bb4a8adac8706285f481 






Merge branch 'mr-merge-base' into 'master'

2016-01-28T21:08:41+00:00

Robert Speicher
robert@gitlab.com

2016-01-28T21:08:41+00:00

2b1ddb0f807b328aae00b1d9b0fb7f62e8adbe59


Correctly determine MR diff base when MR has merge conflicts

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

See merge request !2632





Correctly determine MR diff base when MR has merge conflicts

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

See merge request !2632






add back master only for ruby 2.1 images
2016-01-28T20:54:45+00:00

James Lopez
james@jameslopez.es

2016-01-28T20:54:45+00:00

6e4d36b49d7fc9c41e136f234c6b5dd74a86df50












Merge branch 'highlight-blame' into 'master'

2016-01-28T20:30:21+00:00

Robert Speicher
robert@gitlab.com

2016-01-28T20:30:21+00:00

0e79b5f3967928a576d68d34c0acc1e2aba6c02a


Fix highlighting in blame view.

See merge request !2630





Fix highlighting in blame view.

See merge request !2630






Merge branch 'rs-ldap-user' into 'master'

2016-01-28T19:09:52+00:00

Robert Speicher
robert@gitlab.com

2016-01-28T19:09:52+00:00

789e04835257b8d6be19eaab5da0e8f7ebd74153


Backport LDAP user assignment changes from EE

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

See merge request !2641





Backport LDAP user assignment changes from EE

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

See merge request !2641






Merge branch 'update_sentry_gem' into 'master'

2016-01-28T18:43:40+00:00

Robert Speicher
robert@gitlab.com

2016-01-28T18:43:40+00:00

f673401c030bd6e5ff536415e0c9f443738191d5


Update sentry-raven gem.

Should resolve `fatal: Not a git repository (or any of the parent directories): .git` warnings.

Fixes #12657

See merge request !2636





Update sentry-raven gem.

Should resolve `fatal: Not a git repository (or any of the parent directories): .git` warnings.

Fixes #12657

See merge request !2636






Backport LDAP user assignment changes from EE
2016-01-28T18:31:48+00:00

Robert Speicher
rspeicher@gmail.com

2016-01-28T18:31:48+00:00

1e666ce6958b2b911276d533a9efd699884f6a71

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146





See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146







Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-broken-update
2016-01-28T17:14:28+00:00

James Lopez
james@jameslopez.es

2016-01-28T17:14:28+00:00

69c4e0a1197b21bf0b4925edcda0943be9e0e641