Commits · dd3d62b626f97800e9e72834455def675a879528 · Jérome Perrin / gitlab-ce

20 Mar, 2017 1 commit
- Make feature spec more robust · dd3d62b6
  Toon Claes authored Mar 20, 2017
```
Ensure the correct "Public" radio is selected by choosing it on ID.
```
  dd3d62b6
18 Mar, 2017 1 commit

Fix Error 500 when application settings are saved · 681af5bc

Stan Hu authored Mar 18, 2017

Due to a Rails bug, fetching the application settings from Redis
may prevent the attribute methods from being loaded for the `ApplicationSetting`
model. More details here: https://github.com/rails/rails/issues/27348

There was also a secondary problem introduced by overriding these
association methods which caused all default visibility levels to be
set to `nil`. Before, the previous implementation allowed the string
"20" to be saved as an integer, while now a table lookup happens
before that. We fix this by enforcing the integer value in the
controller and default to PRIVATE.

Closes #29674

681af5bc

17 Mar, 2017 38 commits
- Merge branch '29586-pipelines-tabs' into 'master' · 5d71d9fb
  Annabel Dunstone Gray authored Mar 17, 2017
```
Remove width from nav links

Closes #29586

See merge request !10051
```
  5d71d9fb
- Merge branch 'fixed-diff-avatar-tooltip-escaping' into 'master' · e6f4a4c1
  Filipa Lacerda authored Mar 17, 2017
```
Fixes diff comment avatar tooltip escaping issues

Closes #29572

See merge request !10012
```
  e6f4a4c1
- Merge branch '27477-refactor-notification-recipients' into 'master' · d90c2505
  Rémy Coutable authored Mar 17, 2017
```
Resolve "Extract logic of who should receive notification into separate classes"

Closes #27477

See merge request !9446
```
  d90c2505
- Resolve "Extract logic of who should receive notification into separate classes" · 90ade76b
  Dongqing Hu authored Mar 17, 2017
  
  90ade76b
- Merge branch 'database-config-method' into 'master' · bbddd770
  Rémy Coutable authored Mar 17, 2017
```
Added Gitlab::Database.config

See merge request !10045
```
  bbddd770
- Merge branch 'feature/use-gitaly-for-commit-show' into 'master' · 5409a3c5
  Robert Speicher authored Mar 17, 2017
```
Use Gitaly for CommitController#show

See merge request !9629
```
  5409a3c5
- Merge branch 'fix/gb/gitlab-qa-start-page-cold-boot' into 'master' · c1b4f800
  Rémy Coutable authored Mar 17, 2017
```
Resolve GitLab QA cold boot problems on entry page

See merge request !10003
```
  c1b4f800
- Merge branch 'fl-remove-ujs-pipelines' into 'master' · 0e4f2e01
  Alfredo Sumaran authored Mar 17, 2017
```
Remove UJS actions from pipelines tables

Closes #20450, #28535, and #5580

See merge request !9929
```
  0e4f2e01
- Remove UJS actions from pipelines tables · b0f2cbce
  Filipa Lacerda authored Mar 17, 2017
  
  b0f2cbce
- Merge branch 'fix-time-sensitive-helper-spec' into 'master' · bb1620aa
  Robert Speicher authored Mar 17, 2017
```
Fix time-sensitive helper spec

See merge request !10046
```
  bb1620aa
- Merge branch '29557-fix-unicode-1-1' into 'master' · 1a4aa8d7
  Clement Ho authored Mar 17, 2017
```
Fix Unicode 1.1 emojis

Closes #29557

See merge request !10031
```
  1a4aa8d7
- Remove width from nav links · a2f2b951
  Filipa Lacerda authored Mar 17, 2017
  
  a2f2b951
- Added Gitlab::Database.config · 9a20ff1c
  Yorick Peterse authored Mar 17, 2017
```
This returns the ActiveRecord configuration for the current environment.

While CE doesn't use this very often, EE will use it in a few places for
the database load balancing code. I'm adding this to CE so we don't end
up with merge conflicts in this file.
```
  9a20ff1c
- Merge branch '20121-add-a-new-have_html_escaped_body_text-matcher' into 'master' · 7a623907
  Robert Speicher authored Mar 17, 2017
```
Add a new have_html_escaped_body_text that match an HTML-escaped text

Closes #20121

See merge request !10015
```
  7a623907
- Fix time-sensitive helper spec · 76f7cf92
  Rémy Coutable authored Mar 17, 2017
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  76f7cf92
- Merge branch 'build-notification-null-check' into 'master' · 2b2ce1b2
  Jacob Schatz authored Mar 17, 2017
```
Stop CI notification showing when status is nil

See merge request !10044
```
  2b2ce1b2
- Merge branch 'update-realtime-docs' into 'master' · 7add0e85
  Jacob Schatz authored Mar 17, 2017
```
Updates realtime documentation for the Frontend

See merge request !10038
```
  7add0e85
- Updates realtime documentation for the Frontend · 2e1b9999
  Filipa Lacerda authored Mar 17, 2017
  
  2e1b9999
- Merge branch 'docs/award_emojis' into 'master' · 4c2ea7d0
  Sean Packham (GitLab) authored Mar 17, 2017
```
Refactor award emojis document

Closes #29563

See merge request !10040
```
  4c2ea7d0
- Merge branch 'boards-blank-state-template-in-js' into 'master' · b29a8e3c
  Filipa Lacerda authored Mar 17, 2017
```
Issue boards blank state template in JS file

See merge request !9959
```
  b29a8e3c
- Merge branch '29577-restore-sub-nav-with-activity-tab' into 'master' · 357db226
  Rémy Coutable authored Mar 17, 2017
```
Restore sub-nav (Activity) for empty project

Closes #29577

See merge request !10033
```
  357db226
- Merge branch 'add-labels-to-issue-hook' into 'master' · 1ac6bb55
  Sean McGivern authored Mar 17, 2017
```
Added labels to the issue web hook

Closes #22313

See merge request !9972
```
  1ac6bb55
- Merge branch '29604-v3-fix-branch-creation' into 'master' · d5003424
  Sean McGivern authored Mar 17, 2017
```
Use "branch_name" instead "branch" on V3 branch creation API

Closes #29604

See merge request !10030
```
  d5003424
- Merge branch '21451-allow-disable-mr-link' into 'master' · 375b870b
  Sean McGivern authored Mar 17, 2017
```
Add ability to disable Merge Request URL on push

Closes #21451

See merge request !9663
```
  375b870b
- Add ability to disable Merge Request URL on push · 68e3fa0e
  Alex Sanford authored Mar 17, 2017
  
  68e3fa0e
- Added labels to the issue web hook · f2be76f3
  Luke "Jared" Bennett authored Mar 15, 2017
  
  f2be76f3
- Merge branch '26470-branch-names-with-reference-prefixes-results-in-buggy-branches' into 'master' · d68c23a0
  Sean McGivern authored Mar 17, 2017
```
Strip reference prefixes on branch creation

Closes #26470

See merge request !8498
```
  d68c23a0
- Add a documentation blurb to the new issue template to encourage writing (better) documentation. · 5ae6d1f8
  Job van der Voort authored Mar 17, 2017
  
  5ae6d1f8
- documentation blurb in issue template · 8d8dfd8e
  Job van der Voort authored Mar 17, 2017
  
  8d8dfd8e
- Merge branch 'fix-make-email-static' into 'master' · 2f145352
  Rémy Coutable authored Mar 17, 2017
```
Make sure alias email would never match original user

See merge request !10037
```
  2f145352
- Add a new have_html_escaped_body_text that match an HTML-escaped text · 517598ba
  Rémy Coutable authored Mar 16, 2017
```
This solves transient failures when a text contains HTML-escapable
characters such as `'`.
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  517598ba
- Stop CI notification showing when status is nil · d6c4453a
  Phil Hughes authored Mar 17, 2017
  
  d6c4453a
- Refactor award emojis document · a4069187
  Achilleas Pipinellis authored Mar 17, 2017
```
[ci skip]
```
  a4069187
- Merge branch 'fix-make-time-test-more-reliable' into 'master' · f016da62
  Rémy Coutable authored Mar 17, 2017
```
Make the test less time sensitive by extending 0.2 days

See merge request !10035
```
  f016da62
- Do not use Ruby Timeout module in GitLab QA · cc887599
  Grzegorz Bizon authored Mar 17, 2017
  
  cc887599
- Make sure alias email would never match: · 46287f36
  Lin Jen-Shin authored Mar 17, 2017
```
Hopefully this could fix:

https://gitlab.com/gitlab-org/gitlab-ce/builds/12431186

To make sure that the email would never contain "joh"
otherwise it would match to this `another_user`.
```
  46287f36
- Make the test less time sensitive by extending 0.2 · f451f777
  Lin Jen-Shin authored Mar 17, 2017
```
days. This shall fix:
https://gitlab.com/gitlab-org/gitlab-ce/builds/12411626

and other test failures for the same thing.
```
  f451f777
- Restore sub-nav for empty project · 03ebbccf
  Eric Eastwood authored Mar 16, 2017
```
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/29577
```
  03ebbccf