Commit Graph
13610 Commits
Author SHA1 Message Date
Felipe ArturandYorick Peterse 8828e45c68 Improve code 2016-04-08 12:04:12 +02:00
Felipe ArturandYorick Peterse cc52d4751a Improve code 2016-04-08 12:04:12 +02:00
Felipe ArturandYorick Peterse a33095d435 Fix problem when creating milestones in groups without projects 2016-04-08 12:04:12 +02:00
Rémy Coutable 144912851c Merge branch 'update_main_lang_if_unset' into 'master'
Only update main language if it is not already set

Related to gitlab-org/gitlab-ce#14937 (but does not fully fix) This is a temporary fix so performance isn't affected so much. 

cc @yorickpeterse @ayufan how does this look?

See merge request !3556
2016-04-07 09:41:51 +00:00
Rémy Coutable 8eae7b1088 Merge branch 'feature/expose-builds-badge' into 'master'
Expose badges

This MR exposes badge somewhere in visible place.

![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png)

Closes #13801

See merge request !3326
2016-04-07 08:40:15 +00:00
Rémy Coutable d62a3decf9 Merge branch 'fix_14638' into 'master'
Fixes #14638.

The SQL query was ambiguous and in this case we want to filter projects.

See merge request !3462
2016-04-07 08:35:38 +00:00
Stan Hu 924e4b3700 Return status code 303 after a branch DELETE operation to avoid project deletion
Closes #14994
2016-04-06 21:11:10 -07:00
Jacob Schatz b471c76bcb Reset MR opts 2016-04-06 21:46:12 -04:00
Robert Speicher 936be025cd Merge branch 'saml-external-groups' into 'master'
Allow SAML to identify external users and set them as such

Related to #4009

Fixes #14577

This allows SAML to retrieve group information form the `SAML Response`
and match that to a setting that will flag all matching users as external.

See merge request !3530
2016-04-07 00:35:08 +00:00
Robert Speicher 730625f022 Merge branch 'patch/fix-markdown-preview-wikis' into 'master'
Wiki preview URL converting problem [via Markdown]

Current implementation when rendering the preview, thinks relative links are for project repository files.

We are creating a new preview route that will define correct context data to render for wikis instead.

Fixes #2380, #1184

See merge request !3461
2016-04-07 00:17:21 +00:00
Jacob Schatz 7c6c933c9f Merge branch 'issue_14952' into 'master'
Do not add location badge when creating a group or project

Closes #14952 

![](/uploads/778d0cbccffc717d601a91528ca8eb3c/Screen_Shot_2016-04-05_at_5.34.10_PM.png)

![](/uploads/dbd9eb06b510a6ac091dcf2e3fcb9c88/Screen_Shot_2016-04-05_at_5.34.21_PM.png)

See merge request !3555
2016-04-06 22:55:15 +00:00
Jacob Schatz d2f7813078 Merge branch '14866-url-overflow' into 'master'
Wrap code blocks to next line

Closes #14866 

![Screen_Shot_2016-04-06_at_9.27.06_AM](/uploads/8bed5c17b17c9d15fe34dc7161d31e09/Screen_Shot_2016-04-06_at_9.27.06_AM.png)

See merge request !3573
2016-04-06 22:25:30 +00:00
Annabel Dunstone 86d346b6f4 Change word-break to word-wrap 2016-04-06 14:40:29 -07:00
Alfredo Sumaran bfcee4a51d Merge branch 'master' into issue_14952 2016-04-06 16:35:04 -05:00
Alfredo Sumaran 946b4519c9 Use .new_record? instead 2016-04-06 16:31:34 -05:00
Jacob Schatz b6d5fcd477 Merge branch 'issue_14800' into 'master'
Search Design fixes

Closes #14800 

- Use colors according to design
- Fix width of search input


![Screen_Shot_2016-04-05_at_11.12.33_AM](/uploads/83681ccd90a1a1542c056fd6dbc974d0/Screen_Shot_2016-04-05_at_11.12.33_AM.png)

![Screen_Shot_2016-04-05_at_11.11.54_AM](/uploads/f7557bea2ae055f3550b89751fd7d371/Screen_Shot_2016-04-05_at_11.11.54_AM.png)

See merge request !3475
2016-04-06 21:26:56 +00:00
Annabel Dunstone dcdf0b2af2 Horizontally scroll code blocks instead of wrapping 2016-04-06 13:20:58 -07:00
Annabel Dunstone ebb91c7f04 Wrap code blocks to next line 2016-04-06 13:20:58 -07:00
Drew Blessing 935bf7271d Only update main language if it is not already set 2016-04-06 14:56:40 -05:00
Alfredo Sumaran d1ad639010 Do not fire blur event when clicking a suggestion 2016-04-06 14:28:15 -05:00
Jacob Schatz 452d1d4a8c Merge branch 'dropdown-enter-select-fix' into 'master'
Fixed issue with enter key not selecting correct value in dropdown



See merge request !3563
2016-04-06 19:16:23 +00:00
Jacob Schatz 61d0cf0c61 Merge branch 'delete-icon-color' into 'master'
Fixed delete comment button color

![Screen_Shot_2016-04-06_at_09.55.38](/uploads/526c03db67b0fc7dc9876439f4be2b6b/Screen_Shot_2016-04-06_at_09.55.38.png)

See merge request !3562
2016-04-06 19:13:46 +00:00
Jacob Schatz 205af25a33 Merge branch '14342-merge-button' into 'master'
Update shades of red

Closes #14342 

Before:
![Screen_Shot_2016-04-05_at_12.11.44_PM](/uploads/58cf841fe9527a222bcf70c64f93e2fc/Screen_Shot_2016-04-05_at_12.11.44_PM.png)

Fixed:
![Screen_Shot_2016-04-05_at_12.10.56_PM](/uploads/98358b6a20aaee2ca777eee87075085e/Screen_Shot_2016-04-05_at_12.10.56_PM.png)

See merge request !3549
2016-04-06 19:08:49 +00:00
Alfredo Sumaran 5f4ce722c0 Display clear button only if input has a value 2016-04-06 13:55:49 -05:00
Alfredo Sumaran ee87d15cf4 Change approach, do not use timeouts 2016-04-06 13:23:18 -05:00
Grzegorz Bizon 7689e87854 Use default branch when displaying list of badges 2016-04-06 19:56:35 +02:00
Grzegorz Bizon 5f32b82a80 Change name of badge variable in badges controller 2016-04-06 19:56:34 +02:00
Grzegorz Bizon 15ea971847 Remove obsolete badge code from project view 2016-04-06 19:56:34 +02:00
Grzegorz Bizon a3a93ba4b0 Expose project badges in project settings menu 2016-04-06 19:56:34 +02:00
Grzegorz Bizon 97a2de9e03 Make it possible to switch ref in badges view 2016-04-06 19:56:34 +02:00
Grzegorz Bizon a2bbd2501a Add project header title in project badges view 2016-04-06 19:56:34 +02:00
Grzegorz Bizon dffdb0d036 Use highlight helper to render badges code syntax 2016-04-06 19:56:34 +02:00
Grzegorz Bizon 58d63a66a0 Improve view with list of badges 2016-04-06 19:56:34 +02:00
Grzegorz Bizon b7fa7c4d59 Extend build status badge, add html/markdown methods 2016-04-06 19:56:34 +02:00
Grzegorz Bizon 88fc7ccdda Add project badges view prototype 2016-04-06 19:56:34 +02:00
Jacob Schatz 77e178b5e1 Merge branch 'fix_missing_filters_on_status_tab_change' into 'master'
Fix missing filters on status tab when user swithches to another state

closes #14769 

![fixi](/uploads/7733ec714b70b2157104af4b039953c3/fixi.gif)

See merge request !3482
2016-04-06 17:21:25 +00:00
PotHix 222e1dc59c Fixes #14638.
The SQL query was ambiguous and in this case we want to filter projects.
2016-04-06 13:56:28 -03: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
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
Phil Hughes d6f276eacf Fixed issue with enter key not selecting correct value in dropdown 2016-04-06 10:05:39 +01:00
Phil Hughes 4d463c3b0f Fixed delete comment button color 2016-04-06 09:54:49 +01: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
Alfredo Sumaran 7baebd3220 Do not create input if fieldName is not defined 2016-04-05 19:18:34 -05:00
Alfredo Sumaran d2afeb8dde Do not add location badge when creating a group or project 2016-04-05 17:29:40 -05: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
Annabel Dunstone b23e67bce5 Add CI styling to all CI updates 2016-04-05 14:12:47 -07: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
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 0ab6b82a23 Update shades of red 2016-04-05 12:09:19 -07:00