Commit Graph
22224 Commits
Author SHA1 Message Date
Valery Sizov d794ae8e1f add frequently used category to emoji picker 2015-12-22 23:04:19 +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
Andriy Dyadyura a793590d43 new buttons 2015-12-22 21:22:37 +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
Stan Hu 301a30e0ea Add project permissions to all project API endpoints
This standardizes all the project API formats. Also needed to support Huboard.
2015-12-22 10:58:23 -08:00
Patricio Cano 1d3889eb46 Fix identity and user retrieval when special characters are used 2015-12-22 13:23:35 -05:00
Valery Sizov f049b93965 TYPO in the comment 2015-12-22 20:02:22 +02:00
Valery Sizov 559318c85e customize niceScroll 2015-12-22 19:59:02 +02:00
Valery Sizov 791c5bff7d add some spinach 2015-12-22 19:47:38 +02:00
Valery Sizov bc9467cc08 fix specs 2015-12-22 19:39:15 +02:00
Douglas Barbosa Alexandre 3657eb76c2 Add helper methods to JS validation spec for invalid branch names 2015-12-22 15:32:57 -02:00
Dmitriy Zaporozhets 1cf45407d3 Merge branch 'new-group-page' into 'master'
New group page

Implementing from https://gitlab.com/gitlab-org/gitlab-ce/issues/3480#note_2722988

cc @skyruler 

For https://gitlab.com/gitlab-org/gitlab-ce/issues/3480

See merge request !2174
2015-12-22 16:25:25 +00:00
Jacob Schatz d0fc2fe288 border bottom for last comment fixes double line issue 2015-12-22 11:11:02 -05:00
Douwe Maan 2309f339c6 Merge branch 'hotfix/sidekiq-cron-config' into 'master'
Hotfix for sidekiq-cron being loaded from Settingslogic with defaults

This fixes a regression with "Stack level too deep" from master.

See merge request !2173
2015-12-22 15:47:50 +00: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
Dmitriy Zaporozhets 34653e10aa Bump version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-22 16:37:18 +01:00
Valery Sizov d361e1df81 emoji picker: minor fixes 2015-12-22 17:15:25 +02:00
Valery Sizov 4dd892b20b emoji css refactoring 2015-12-22 17:09:28 +02:00
Gabriel Mazetto a7a52f7567 Hotfix for sidekiq-cron being loaded from Settingslogic with defaults 2015-12-22 13:02:42 -02:00
Valery SizovandValery Sizov 2eed8007bf base implementation of emoji picker [ci skip] 2015-12-22 16:48:55 +02:00
Dmitriy Zaporozhets 347c1136c2 Merge branch 'new-colors' into 'master'
New colour scheme

old
![Screenshot_2015-12-17_14.14.53](/uploads/5d6ac28b6d99186485d727a72cc8a662/Screenshot_2015-12-17_14.14.53.png)

new
![Screenshot_2015-12-17_14.15.07](/uploads/06e07fa3716aa8664b1507b390270285/Screenshot_2015-12-17_14.15.07.png)

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

See merge request !2151
2015-12-22 10:43:56 +00:00
Dmitriy Zaporozhets 52bca6da22 New color for cover block background
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-22 11:22:14 +01:00
Dmitriy Zaporozhets e6e338f00e Merge branch 'feature/sidekiq-cron-config' into 'master'
Sidekiq-cron configuration moved to gitlab.yml

When `sidekiq-cron` was introduced, jobs configuration where placed
in `schedule.yml` file.

As discussed in #3928, this is not desirable. 
We moved it to `gitlab.yml`, exposing only the "cron" part of the configuration.

See merge request !2087
2015-12-22 09:49:47 +00: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
Grzegorz Bizon 2ed7b964fa Rename CI lint specs file 2015-12-22 08:49:12 +01:00
Grzegorz Bizon aff713988b Improve CI Lint specs (refactoring) 2015-12-22 08:47:23 +01:00
Raymii 9a166c1ed8 update-init-script was listed two times. removed one without explanation. 2015-12-22 05:29:19 +00:00
Rubén Dávila 42da7cd375 Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189 2015-12-21 22:59:15 -05:00
Robert Speicher 25bf3eb804 Merge branch 'fix-mr-500' into 'master'
Fix MR 500 when viewing the MR page

Fixes #2712 

See merge request !2167
2015-12-22 03:37:16 +00:00
Robert Speicher 36026fb97b Merge branch 'rs-bump-nokogiri' into 'master'
Explicitly require Nokogiri 1.6.7.1 due to security issue

```
Name: nokogiri
Version: 1.6.7
Advisory: CVE-2015-5312
Criticality: High
URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
Title: Nokogiri gem contains several vulnerabilities in libxml2
Solution: upgrade to >= 1.6.7.1
```

See merge request !2154
2015-12-22 03:16:08 +00:00
Robert Speicher 09008026f6 Move ci_build_details_path helper spec to correct location
Also, make it not fail.
2015-12-21 21:57:51 -05:00
Douglas Barbosa Alexandre 23b436dc93 Fix minor stylistic complaints 2015-12-21 22:21:10 -02:00
Kamil Trzcinski f8986e4bb6 Update CHANGELOG 2015-12-22 00:28:38 +01:00
Kamil Trzcinski a495b9bc18 Deprecate GitLabCiService making it to always be inactive 2015-12-22 00:28:38 +01:00
Kamil Trzcinski f898e52a00 ci_build_details_path should return nil if builds_page result is nil
This is required since we parse URI later and remove the credentials
2015-12-22 00:28:36 +01:00
Marvin FrickandKamil Trzcinski 0d05400bde removes api credentials from link to build_page
Also adds a spec for MergeRequestHelper to avoid having a regression
later on.
2015-12-22 00:28:19 +01:00
Jacob Schatz 3ea3d9ef28 changes issue-box to status-box since html was changed as well 2015-12-21 17:10:27 -05:00
Jacob Schatz 453479143d adds alerts for when http request errors out in some way. 2015-12-21 17:03:28 -05:00
Drew Blessing 66a8281fdd Fix and test leave project display 2015-12-21 15:58:42 -06:00
Jacob Schatz 801b801bf0 removes console logs 2015-12-21 16:46:36 -05:00
Jacob Schatz 1f5b8e88f3 changes data-url to href for javascript url grabbing 2015-12-21 16:45:52 -05:00
Jacob Schatz 3e7e7ae0ac clarifies tests with methods like toBeVisible() etc. 2015-12-21 16:35:03 -05:00
Jacob Schatz fec7c99e2f updates tests style for four-phase-testing as per: https://robots.thoughtbot.com/four-phase-test 2015-12-21 16:27:52 -05:00
Jacob Schatz 531d06d170 removes console.logs 2015-12-21 16:16:04 -05:00
Jacob Schatz 62aac539b9 project header 2015-12-21 15:47:29 -05:00
Robert Speicher 4156a37aec Add 8.4.0 to CHANGELOG
[ci skip]
2015-12-21 15:34:39 -05:00
Robert Speicher d563722f7f Merge branch 'contributing-grabs-fix' into 'master'
Fixed wrong URL to "up for grabs" issue filter

[ci skip]

See merge request !2162
2015-12-21 20:28:14 +00:00
Achilleas Pipinellis d5e9436033 Document triggers in yaml/README.md [ci skip] 2015-12-21 20:41:51 +02:00