Commit Graph
5891 Commits
Author SHA1 Message Date
Stan Hu 8309ef45a9 Enable "Add key" button when user fills in a proper key
Closes #4295
2015-12-24 11:34:32 -08: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
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
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 44cf1cbaaf Merge remote-tracking branch 'origin/master' into emoji-picker-search 2015-12-24 14:57:07 +02: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 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
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
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
Valery Sizov b6de0d2830 Emoji picker: better alias handling 2015-12-24 11:28:55 +02: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
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 52293ccd65 refactoring javascript to put starring functionality in a function 2015-12-23 12:54:51 -05:00
Jacob Schatz 8bbcbe7854 spacing changed from 4 to 2 in _clone_panel.html.haml. 2015-12-23 12:43:27 -05:00
Jacob Schatz 69f9bf77d4 spinach tests will pass now 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz ea5fa54b2d dropdown chooses right default 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz f56783e524 adds dropdown for cloning 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz 011a7a3297 adds starring and unstarring text to star button, also adds partial new styles 2015-12-23 12:26:50 -05:00
Jacob SchatzandJacob Schatz 7b50ab5c1d arrows for buttons 2015-12-23 12:26:50 -05:00
Dmitriy Zaporozhets 9f69a0b229 Merge branch 'new-project-button-seperate-from-filter-name' into 'master'
New project button with filter in header.

Fixes #3943 
![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/f7f952440b4bb4b55f62241bbc328c95/Screen_Shot_2015-12-21_at_3.47.01_PM.png)


See merge request !2165
2015-12-23 16:51:03 +00:00
Andriy Dyadyura 5e0b989fca new button sizes 2015-12-23 15:46:13 +01:00
Dmitriy Zaporozhets 16a79f56b8 Merge branch 'new-buttons' into 'master'
New buttons

OLD
![Screenshot_2015-12-22_21.42.59](/uploads/79e85727586f7b917b8ab9ef867e79dc/Screenshot_2015-12-22_21.42.59.png)

NEW
![Screenshot_2015-12-22_21.42.21](/uploads/aee54160f17e0502e14ca5c754dcfe50/Screenshot_2015-12-22_21.42.21.png)


See merge request !2179
2015-12-23 14:07:10 +00:00
Jacob Schatz 265750c80d adds css for left-top-menu. Also hides buttons in certain for factors. 2015-12-23 09:00:59 -05:00
Jacob Schatz 48ecb614e7 project header 2015-12-23 08:25:03 -05:00
Grzegorz Bizon e1e39b61e5 Merge branch 'fix/ci-runners-token-persistence' into 'master'
Fix method that ensures authentication token

Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database.

This closes #4235.

See merge request !2185
2015-12-23 12:07:37 +00:00
Dmitriy Zaporozhets a84ecf0e2e Fix close/reopen buttons
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-23 12:29:50 +01:00
Dmitriy Zaporozhets 7a519bc1e2 Merge branch 'master' into new-buttons 2015-12-23 12:16:37 +01:00
Valery Sizov efe98067da emoji picker search 2015-12-23 13:08:47 +02:00
Dmitriy Zaporozhets 37120872e6 Merge branch 'improve_emoji_picker' into 'master'
Improve emoji picker

This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well.

Some categories are pretty poor, it can be extended in the future.

It's a first step on the way to improve picker.

The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution.

![Screenshot_2015-12-22_23.26.27](/uploads/7d323eb0586204ac92915b41233b97ec/Screenshot_2015-12-22_23.26.27.png)


See merge request !2172
2015-12-23 11:01:49 +00:00
Grzegorz Bizon 3e6950481a Use method that creates runners registration token
`runners_registration_token` now creates a new token if it is blank.
2015-12-23 11:45:17 +01:00
Grzegorz Bizon e68ae9c6af Merge branch 'fix/ci-lint' into 'master'
Make CI Lint form synchronous

This removes `remote: true` from CI Lint form, making it synchronous
form. This also removes some complexity related to displaying lint
messages.

View also has been updated, removed deprecated Bootstrap 2 tags.
Improved design.

See merge request !2171
2015-12-23 10:43:32 +00:00
Valery Sizov 44d8714f38 improved emoji picker style 2015-12-22 23:27:05 +02:00
Valery Sizov 0d52a694bf customize niceScroll 2015-12-22 23:12:23 +02:00
Valery Sizov a48dd40a92 base implementation of emoji picker [ci skip] 2015-12-22 23:12:23 +02:00
Andriy Dyadyura f4dabf9795 new buttons issue 2015-12-22 21:37:11 +01:00
Andriy Dyadyura a72b71abcc new buttons issue 2015-12-22 21:29:31 +01:00
Stan Hu 3b61dc47ec Merge branch 'fix_leave_project_display' into 'master'
Fix and test leave project display

The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing. 

This fixes the display and also adds 2 different tests for it.

cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you!

See merge request !2166
2015-12-22 19:30:32 +00:00
Stan Hu 4949f40ac4 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'
```
2015-12-22 11:13:09 -08:00
Dmitriy Zaporozhets 8516b20571 New UI for group page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-22 16:37:29 +01:00
Grzegorz Bizon d74b254d97 Make CI Lint form synchronous
This removes `remote: true` from CI Lint form, making it synchronous
form. This also removes some complexity related to displaying lint
messages.

View also has been updated, removed deprecated Bootstrap 2 tags.
Improved design.

Closes #4206
2015-12-22 09:40:32 +01:00
Drew Blessing 66a8281fdd Fix and test leave project display 2015-12-21 15:58:42 -06:00
Robert Speicher f4c05ee45f Merge branch 'admin_add_identity' into 'master'
Allow admin to create new user identities

Fixes #2442 

See merge request !2077
2015-12-21 17:58:20 +00:00
Robert Speicher 9570495e75 Merge branch 'add_email_unlock' into 'master'
Allow account unlock via email

We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.

See merge request !2049
2015-12-21 17:53:20 +00:00
Douwe Maan 17ed42e362 Merge branch 'issue_3452' 2015-12-21 17:43:58 +01:00
Douwe Maan e209ba7002 Merge branch 'git-version' into 'master'
Show git version on admin page

Before
![git-version-beore](/uploads/57444ad42220c9dfe8f187b8e399227f/git-version-beore.png)

After
![git-version-after](/uploads/cc1b52ae1a251c2c46d9626c040726ab/git-version-after.png)

gitlab-org/gitlab-ce#4077




See merge request !2101
2015-12-21 16:33:18 +00:00
Grzegorz Bizon 27859f7ed9 Merge branch 'ci-commit-status-skipped' into 'master'
Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled

Fixes #3827 
Fixes #4157

/cc @grzesiek @dblessing 

See merge request !2139
2015-12-18 18:48:06 +00:00