Commit Graph
26262 Commits
Author SHA1 Message Date
James Lopez 5d642fb7aa fix rubocop warnings 2016-04-08 15:07:12 +02:00
James Lopez de6c44e983 using new config 2016-04-07 18:14:42 +02:00
James Lopez acfa0b69d5 continuing to refactor config, added spec and fixed a few problems 2016-04-07 13:19:57 +02:00
James Lopez b4fe002264 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-04-06 18:16:20 +02:00
Rémy Coutable 801e870ddb Merge branch 'api-user-location' into 'master'
Expose user location in API

* Closes #14720 

See merge request !3558
2016-04-06 16:15:39 +00:00
James Lopez efde96e9cd started refactored the dynamic rules to be defined in a yml file 2016-04-06 18:12:41 +02:00
Rémy Coutable 26f51bb07d Merge branch 'buildsemailservice-should-filter-out-blank-email-addresses-14883' into 'master'
Ensure empty recipients are rejected in BuildsEmailService

Fixes #14883.

See merge request !3543
2016-04-06 14:49:40 +00:00
Kamil Trzciński d202c0b0e6 Merge branch 'ci-tags' into 'master'
Optimise .gitlab-ci.yml

Not sure who should I assign.



See merge request !3542
2016-04-06 14:37:12 +00: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
Kamil Trzcinski b818e74e0c Optimise .gitlab-ci.yml 2016-04-06 15:56:06 +02:00
Robert Schilling 62b6963255 Expose user location in API 2016-04-06 15:53:17 +02:00
Jeroen van Baarsen 1749bd3b46 Merge branch 'feature/margin-bottom-for-empty-repos' into 'master'
Added bottom margin to CLI instructions

The CLI instructions block in the empty project page is missing a margin-bottom style property. I added it, you can review the only line I edited to add this.

This only fixes a UX bug (to me), related to the "Remove project" button that is not correctly padded. Now I believe that part look better :)

I attach screenshots.

### before
![Selezione_009](/uploads/f46b2a26c192a0b1994ff2f037f50e6c/Selezione_009.png)

### after
![Selezione_008](/uploads/33a9451bbe8bfd9abd300f9c6eb4005f/Selezione_008.png)

See merge request !3505
2016-04-06 13:27:22 +00:00
Jeroen van Baarsen c49f9c6174 Merge branch 'api-retrieve-tag' into 'master'
API: Ability to retrieve a single tag

* Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14330

/cc @dblessing 

See merge request !3567
2016-04-06 13:24:56 +00:00
Robert Schilling 7f287c9136 API: Ability to retrieve a single tag 2016-04-06 13:59:50 +02:00
Jacob Schatz f76bfed9fc Merge branch '14942-last-commit-styling' into 'master'
Add CI styling to all CI updates

Fixes #14942 

Correct styling for last commit:
![Screen_Shot_2016-04-05_at_2.17.54_PM](/uploads/8cbda0023eaf7a26b776f3da58050e1a/Screen_Shot_2016-04-05_at_2.17.54_PM.png)

See merge request !3554
2016-04-06 00:57:40 +00:00
Stan Hu 779b9eac57 Merge branch 'fix-project-path-rename' into 'master'
Fix Error 500 after renaming a project path

Renaming the path of a project would result in an Error 500 due to `@repository` being memoized with the old path. An Error 500 would result:

```
Started GET "/testing2/test1" for 127.0.0.1 at 2016-04-04 12:42:30 +0000
Processing by ProjectsController#show as HTML
  Parameters: {"namespace_id"=>"testing2", "id"=>"test1"}
Completed 200 OK in 637ms (Views: 194.2ms | ActiveRecord: 111.8ms)
Started GET "/testing2/test1/edit" for 127.0.0.1 at 2016-04-04 12:42:33 +0000
Processing by ProjectsController#edit as HTML
  Parameters: {"namespace_id"=>"testing2", "id"=>"test1"}
Completed 200 OK in 594ms (Views: 183.8ms | ActiveRecord: 87.4ms)
Started PATCH "/testing2/test1" for 127.0.0.1 at 2016-04-04 12:42:41 +0000
Processing by ProjectsController#update as HTML
  Parameters: {"utf8"=>"✓", "authenticity_token"=>"[FILTERED]", "project"=>{"nam
e"=>"test123", "path"=>"test123"}, "namespace_id"=>"testing2", "id"=>"test1"}
Completed 500 Internal Server Error in 1852ms (ActiveRecord: 124.0ms)

ActionView::Template::Error (no repository for such path):
    2:   %legend
    3:     Builds:
    4:
    5:   - unless @repository.gitlab_ci_yml
    6:     .form-group
    7:       .col-sm-offset-2.col-sm-10
    8:         %p Builds need to be configured before you can begin using Contin
uous Integration.
  app/models/repository.rb:59:in `block in empty?'
  lib/repository_cache.rb:19:in `fetch'
  app/models/repository.rb:59:in `empty?'
  app/models/repository.rb:471:in `gitlab_ci_yml'
  app/views/projects/_builds_settings.html.haml:5:in `_app_views_projects__build
s_settings_html_haml__782034335636359229_73397600'
  app/views/projects/edit.html.haml:87:in `block in _app_views_projects_edit_htm
l_haml___2388082585934859365_47390860'
  app/views/projects/edit.html.haml:8:in `_app_views_projects_edit_html_haml___2
388082585934859365_47390860'
  app/controllers/projects_controller.rb:54:in `block (2 levels) in update'
  app/controllers/projects_controller.rb:43:in `update'
  lib/gitlab/middleware/go.rb:16:in `call'
```

Closes #14885

See merge request !3528
2016-04-05 22:16:15 +00:00
Robert Speicher 74313988ac Merge branch 'rs-fix-gmail-actions' into 'master'
Premailer shouldn't remove script tags from our emails

Closes #14943.

See merge request !3552
2016-04-05 21:47:08 +00:00
Robert Speicher b393e513fe Update CHANGELOG for 8.3.5 and 8.3.6
[ci skip]
2016-04-05 17:16:48 -04:00
Annabel Dunstone b23e67bce5 Add CI styling to all CI updates 2016-04-05 14:12:47 -07:00
Robert Speicher ee1de011d1 Premailer shouldn't remove script tags from our emails
Closes #14943.
2016-04-05 17:03:34 -04:00
Jacob Schatz 2446f853bd Merge branch 'close-issue-bug' into 'master'
Fix data check in update issue response



See merge request !3548
2016-04-05 20:48:00 +00:00
Annabel Dunstone 1eeec7c63e Update issue_spec test 2016-04-05 13:13:49 -07:00
Jacob Schatz a1c794c591 Merge branch 'dropdown-arrow-support' into 'master'
Dropdown arrow support

When the dropdown is open, you can scroll through the list of items with the up & down arrow keys. When an item is focused, the enter triggers the click event for that row.

Closes #14455

See merge request !3385
2016-04-05 19:41:22 +00:00
Jacob Schatz 4258589d95 Merge branch 'note-form-design' into 'master'
Notes form design update

Part of #3401

See merge request !3442
2016-04-05 19:34:16 +00:00
Annabel Dunstone 33faf219aa Fix data check in update issue response 2016-04-05 11:43:30 -07:00
Stan Hu 934f1e9097 Fix Error 500 after renaming a project path
Closes #14885
2016-04-05 11:18:13 -07:00
Robert Speicher b8d0f17422 The Markdown doc is one place where trailing whitespace matters
[ci skip]
2016-04-05 14:06:56 -04:00
Sytse Sijbrandij 79d6513f36 Merge branch 'markdown-attribution' into 'master'
Attribution where it is due.

Inspired by https://news.ycombinator.com/item?id=11431969

See merge request !3546
2016-04-05 18:03:02 +00:00
Robert Speicher c61fe24529 Merge branch 'upgrade-bundler-audit' into 'master'
Upgrade bundler-audit from 0.4.0 to 0.5.0

Bundler Audit can now run the `check` command with an `—update` flag to update the Ruby CVE repository before checking. This removes the need for two separate commands in GitLab CI ([source](https://github.com/rubysec/bundler-audit#synopsis)).

See the Changelog for more information: https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md#050--2015-02-28

See merge request !3433
2016-04-05 17:40:52 +00:00
Sytse Sijbrandij 400a7b995d Attribution where it is due. 2016-04-05 13:24:58 -04:00
Douwe Maan 7ff974e38e Merge branch 'fix/permissions-when-importing-members' into 'master'
Check permissions when importing project members

Closes #14899

See merge request !3535
2016-04-05 17:02:24 +00:00
Rémy Coutable 9f33bf86cf Add 8.4.6 and 8.4.7 CHANGELOG items
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-05 18:56:09 +02:00
Rémy Coutable c8d0f35502 Add 8.5.9 CHANGELOG item
[ci skip]

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-05 18:50:43 +02:00
Achilleas Pipinellis 59466a4780 Merge branch 'doc_ldap_fixes' into 'master'
Fix LDAP link and codeblock indentation



See merge request !3538
2016-04-05 14:37:40 +00:00
Achilleas Pipinellis 7b290e29f0 Fix LDAP link and codeblock indentation
[ci skip]
2016-04-05 17:04:16 +03:00
Yorick Peterse e1bc16cbdf Merge branch 'reorder-language' into 'master'
Update language after doing all other operations

See merge request !3533
2016-04-05 13:46:14 +00:00
Jacob Schatz 353365c7f2 Merge branch 'build-notification-changelog' into 'master'
Added CHANGELOG for build notifications

[ci skip]

See merge request !3537
2016-04-05 12:52:24 +00:00
Grzegorz Bizon bb9c194c23 Respond 404 when unauthorized user imports members 2016-04-05 14:37:06 +02:00
Phil Hughes f22e6515df Added CHANGELOG for build notifications
[ci skip]
2016-04-05 13:36:00 +01:00
Jacob Schatz 97747233a9 Merge branch 'scss-lint-comments' into 'master'
Add comments to the SCSS Lint config file [ci skip]

This MR also adds some previously missing linters.

See merge request !3500
2016-04-05 12:20:08 +00:00
Grzegorz Bizon c52b5c92fb Do not leak project exists when importing members
When importing members, and user does not have permissions to read
members in a source project, do not leak information about source
project existence. Notifiy user that project has not been found instead.
2016-04-05 13:55:15 +02:00
Jacob Schatz 095386d600 Merge branch 'missing-changelog' into 'master'
Add missing changelog item about improving navigation sidebar

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For !3494 and #14838 

See merge request !3527
2016-04-05 11:48:45 +00:00
Grzegorz Bizon b248ee9381 Check permissions when importing project members
Closes #14899
2016-04-05 13:32:28 +02:00
Kamil Trzcinski aad3b6ddf8 Update language only on HEAD of the repository 2016-04-05 11:08:41 +02:00
Kamil Trzcinski b8d1545bf1 Update language after doing all other operations 2016-04-05 10:54:34 +02:00
Yorick Peterse 8a0a802ee9 Merge branch 'fix-gh-pr-import' into 'master'
Fix Importing repos from GHE doesn't work

See merge request !3529
2016-04-05 08:17:47 +00:00
Phil Hughes 4d9d06ec50 Removed emoji button from notes form 2016-04-05 09:12:26 +01:00
Phil Hughes 8e3f5ebaa0 CS multiline 2016-04-05 09:07:40 +01:00
Robert Speicher 6bf4e9e752 Merge branch 'banzai-image-link' into 'master'
Add link to image URL for images in discussions.

The main problem with this is that it doesn't apply retroactively, only to images that are uploaded after this change. It's also hacky and probably not the most optimal solution.

Resolves #14411.

See merge request !3464
2016-04-05 03:52:31 +00:00
connorshea b9abf938ed Wrap images in discussions and wikis with a link to the image source using ImageLinkFilter.
Resolves #14411.

See merge request !3464
2016-04-04 19:44:07 -06:00