Commit Graph
22224 Commits
Author SHA1 Message Date
Stan Hu 5a8c65b508 Add API support for looking up a user by username
Needed to support Huboard
2015-12-24 07:57:13 -08:00
Dmitriy Zaporozhets 7caaa10807 Merge pull request #9915 from huacnlee/avoid-ability-methods-allocations
Avoid allocations in Ability class.
2015-12-24 16:28:03 +01:00
Dmitriy Zaporozhets 1a23af485c Merge branch 'fix-explore-ui' into 'master'
Fix explore projects page UI

# Before

![Screenshot_2015-12-24_14.13.03](/uploads/fdae7648acc8b8076709e4bfc867a5f8/Screenshot_2015-12-24_14.13.03.png)


# After

![Screenshot_2015-12-24_14.11.29](/uploads/b1ecd3bebfadab9d2ceabaae27046271/Screenshot_2015-12-24_14.11.29.png)



cc @jschatz1 @skyruler 


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


See merge request !2202
2015-12-24 15:05:28 +00:00
Valery Sizov 355e62eb49 added default for frequently used emojis 2015-12-24 16:40:10 +02:00
Douwe Maan 0869d84c07 Merge branch 'fix-master' into 'master'
Fix NewBranchForm spec

cc @vsizov 

See merge request !2204
2015-12-24 14:36:36 +00:00
Douwe Maan 672cbbff95 Only allow group/project members to mention @all 2015-12-24 15:33:51 +01:00
Dmitriy Zaporozhets aa712e2b36 Merge branch 'new-project-header-redesign' into 'master'
Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now

Fixes #2876 and #3482
Used existing styles. <br/>
Did not attempt to make pixel perfect as styles already exist. <br/>

![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png)

See merge request !2156
2015-12-24 14:17:11 +00:00
Douwe Maan 93b5ea6f0e Fix NewBranchForm spec 2015-12-24 15:09:29 +01:00
Valery Sizov d84ca3e815 Merge branch 'emoji-picker-search' into 'master'
Emoji picker search

depend on !2172

Issue https://gitlab.com/gitlab-org/gitlab-ce/issues/3576

!!! Should be merged after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2198

![Screenshot_2015-12-23_11.44.57](/uploads/01da0b62c3c234307142e2c4db68e53f/Screenshot_2015-12-23_11.44.57.png)

See merge request !2186
2015-12-24 13:58:49 +00:00
Valery Sizov a55b653d93 fix of frequently used emojis 2015-12-24 15:44:43 +02:00
Dmitriy Zaporozhets 40a3845fab Fix explore projects page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-24 14:11:51 +01:00
Valery Sizov 5ed1256492 Merge branch 'emoji-picker-search' into emoji_picker_frequently_used 2015-12-24 15:06:51 +02:00
Dmitriy Zaporozhets 1f9633d67c Merge branch 'fix-milestones-with-slashes' into 'master'
Fix Error 500 when global milestones have slashes

* Closes #4226

* Closes https://github.com/gitlabhq/gitlabhq/issues/9921

See merge request !2182
2015-12-24 13:04:43 +00:00
Valery Sizov 44cf1cbaaf Merge remote-tracking branch 'origin/master' into emoji-picker-search 2015-12-24 14:57:07 +02:00
Valery Sizov 6d07054747 fix specs 2015-12-24 14:54:02 +02:00
Dmitriy Zaporozhets d1043c4389 Merge branch 'new-nav-width' into 'master'
nav full width

old
![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/ef47c61eb33521087fc40d400d01cba8/Screen_Shot_2015-12-21_at_3.47.01_PM.png)

new
![Screenshot_2015-12-24_12.16.53](/uploads/30cf37886b3710a22daa0b82583975e9/Screenshot_2015-12-24_12.16.53.png)


See merge request !2200
2015-12-24 12:35:24 +00:00
Dmitriy Zaporozhets 76b7e24f85 Merge branch 'edit-on-fork' into 'master'
Automatically fork a project when not allowed to edit a file.

Fixes #3215.

To do:

- [ ] Add tests

-----

## "Edit" button on file in a project the user does NOT have write access to

![edit_file](/uploads/7602157420768aef483a6586bba2d164/edit_file.png)

## Clicking will automatically create a fork

![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png)

## When the fork has been created, the user is returned to the edit page on the original project with a notice

![edit_notice](/uploads/94ed1319404370ff1e9c0d672fb41e03/edit_notice.png)

## The user cannot change the target branch and is informed that editing will start an MR

![edit_footer](/uploads/4da68d4795c7177e575b7c434d16eeae/edit_footer.png)

## Hitting "Commit changes" will commit and start an MR from my fork to the origin project

![Screen_Shot_2015-12-17_at_23.38.08](/uploads/d777a4db6f38a5a1be84031694465bc1/Screen_Shot_2015-12-17_at_23.38.08.png)

-----

## "Create file, "Upload file" and "New directory" buttons in a project the user does NOT have write access to

![new_directory](/uploads/72f556248f30d6652523bbb4be01b3e0/new_directory.png)

## Clicking any of these options will automatically create a fork

![during_fork](/uploads/32f4f5dff9f24ea99522000b0bf881c5/during_fork.png)

## When the fork has been created, the user is returned to the tree page on the original project with a notice

![new_directory_notice](/uploads/a1a3e11308ae0e8f0913fae6813a37ed/new_directory_notice.png)

## Clicking "New directory" again will show the modal. The user cannot change the target branch and is informed that editing will start an MR

![new_dir](/uploads/99ca8cbfb2f70603e352b3fdf67b6281/new_dir.png)

## Hitting "Create directory" will commit and start an MR from my fork to the origin project

![Screen_Shot_2015-12-17_at_23.39.19](/uploads/3713d0235abf831361b803a6198c5bc1/Screen_Shot_2015-12-17_at_23.39.19.png)

cc @dzaporozhets @skyruler

See merge request !2145
2015-12-24 12:24:57 +00:00
Douwe Maan 7309b848e2 Move changelog items to their correct place. 2015-12-24 12:20:00 +00:00
Douwe Maan 84e75ebd4c Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master'
Fix/visibility level setting in forked projects

Fixes #3136

/cc @DouweM 

See merge request !1744
2015-12-24 12:09:38 +00:00
Douwe Maan 6b968a8fcd Merge branch 'branch-invalid-name' into 'master'
Add JS validation for invalid characters  in branch name

Fixes #3293 

Demo:

![out-1080p](/uploads/ba21c359b6b8b440c40cacf772ec0df7/out-1080p.gif)


See merge request !2122
2015-12-24 11:42:25 +00:00
Douwe Maan 541da4d51f Merge branch 'issue_4189' into 'master'
Fix redirect to wrong URL when merging and MR detail URL has an anchor.

Closes #4189

See merge request !2169
2015-12-24 11:41:36 +00:00
Valery Sizov 999a374f77 Merge branch 'emoji-picker-search'into emoji_picker_frequently_used 2015-12-24 13:38:17 +02:00
Douwe Maan 662aa8ec35 No mb_chars needed anymore 2015-12-24 12:37:46 +01:00
Valery Sizov e622259d5b Merge branch 'emoji-picker-fix' into 'master'
Emoji picker: better alias handling

related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576

See merge request !2198
2015-12-24 11:24:03 +00:00
Andriy Dyadyura 5939d24756 nav full width 2015-12-24 12:22:01 +01:00
Dmitriy Zaporozhets 75c3a2f89b Merge branch 'rs-bump-underscore-rails' into 'master'
Bump underscore-rails to ~> 1.8.0

Addresses #2857

See merge request !2193
2015-12-24 10:36:36 +00:00
Dmitriy Zaporozhets d095cbd70b Merge branch 'filter-project-list-fix' into 'master'
fixes the search for projects

Also makes improvements for jQuery queries. <br/>
@creamzy @skyruler <br/>
Fixes issues introduced in MR for #3943

See merge request !2194
2015-12-24 10:35:57 +00:00
Valery Sizov e557c8d0a2 Merge branch 'emoji-picker-fix' into emoji-picker-search 2015-12-24 12:16:10 +02:00
Valery Sizov 09c5968fa3 fix spec 2015-12-24 12:14:46 +02:00
Valery Sizov d4e9c75844 Merge remote-tracking branch 'origin/master' into emoji-picker-search 2015-12-24 12:01:22 +02:00
Valery Sizov 5da8c1f77a fixes after review 2015-12-24 11:57:46 +02:00
Valery Sizov 694579ce04 Merge branch 'emoji-picker-fix' into emoji-picker-search 2015-12-24 11:50:58 +02:00
Tomasz Maczukin c301ab0404 Add some specs for forked project visibility_level cases 2015-12-24 10:33:26 +01:00
Valery Sizov b6de0d2830 Emoji picker: better alias handling 2015-12-24 11:28:55 +02:00
Robert Speicher 94a55045dc Merge branch 'its-its' into 'master'
Fix spelling of "it's" to "its" where appropriate.

[ci skip]

See merge request !2196
2015-12-24 04:38:07 +00:00
cafuego 9c893af7ad Fix spelling of "it's" to "its" where appropriate. 2015-12-24 15:28:12 +11:00
Jacob Schatz 00e967a07f removes unused alert from issue spec. Requires flash in the *implementation* instead of the spec. 2015-12-23 20:57:16 -05:00
Jacob Schatz a1294e5aab fixes css spacing issues 2015-12-23 20:39:42 -05:00
Jacob Schatz 6592bfbb9e Moves star code to a class 2015-12-23 20:36:29 -05:00
Jacob Schatz 7ba4482fcf fixes failing test by updating project clone instructions 2015-12-23 19:57:30 -05:00
Jacob Schatz 77daadc92c Merge branch 'master' into new-project-header-redesign 2015-12-23 18:59:06 -05:00
Jacob Schatz 3ece40c222 fixes the search for projects 2015-12-23 18:27:38 -05:00
Dmitriy Zaporozhets c75ac8218e Merge branch 'fix-error-500-global-search-issues' into 'master'
Fix Error 500 when doing a search in dashboard before visiting any project

If a search turned up an issue, under certain conditions you would see this error:

```
ActionView::Template::Error (undefined method `path_with_namespace' for nil:NilClass):
     6:   - if issue.description.present?
     7:     .description.term
     8:       = preserve do
     9:         = search_md_sanitize(markdown(issue.description))
    10:   %span.light
    11:     #{issue.project.name_with_namespace}
    12:   - if issue.closed?
  lib/gitlab/markdown/upload_link_filter.rb:36:in `build_url'
  lib/gitlab/markdown/upload_link_filter.rb:31:in `process_link_attr'
  lib/gitlab/markdown/upload_link_filter.rb:18:in `block in call'
  lib/gitlab/markdown/upload_link_filter.rb:17:in `call'
  lib/gitlab/markdown.rb:127:in `gfm'
  lib/gitlab/markdown.rb:24:in `render'
  app/helpers/gitlab_markdown_helper.rb:61:in `markdown'
  app/views/search/results/_issue.html.haml:9:in `block in _app_views_search_results__issue_html_haml__4127460390996300432_59973760'
  app/views/search/results/_issue.html.haml:8:in `_app_views_search_results__issue_html_haml__4127460390996300432_59973760'
  app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__589475855773452465_61761440'
  app/views/search/show.html.haml:5:in `_app_views_search_show_html_haml___1852335078065998536_69780120'
```

Confirmed this is issue still happens in GitLab 8.4, and it also happens on GitLab.com. Here's how to reproduce:

1. Login in a new browser.
2. Enter a search term on the top right that will land a hit in the "Issues" (e.g. GitLab).
3. Click on "Issues" tab. You should get an Error 500.

The issue is that @project isn't assigned to anything.

See merge request !2110
2015-12-23 22:46:23 +00:00
Jacob Schatz e11ee5ff01 adds test for issue close/reopen failure 2015-12-23 17:41:05 -05:00
Robert Speicher 5a3b9c97e3 Account for @project.description being nil 2015-12-23 17:14:18 -05:00
Jacob Schatz b3e4bc5911 resolves conflicts with new buttons 2015-12-23 17:05:29 -05:00
Jacob Schatz 7e43fa6709 fixes tests to work with jasmine/jquery 2015-12-23 16:56:36 -05:00
Robert Speicher b26eb782f5 Add page descriptions and images
A limited number of pages have defined their own descriptions, but
otherwise we default to the Project's description (if `@project` is
set), or the old `brand_title` fallback.

The image will either be the uploaded project icon (never a generated
one), the user's uploaded icon or Gravatar, or, finally, the GitLab
logo.
2015-12-23 16:56:27 -05:00
Robert Speicher 3f452f539b Add gitlab_logo.png, remove brand_logo.png 2015-12-23 16:45:37 -05:00
Robert Speicher 1100eb0c4e Merge branch 'make-migrations-reversible' into 'master'
Make migrations reversible

See merge request !2191
2015-12-23 19:20:07 +00:00