- 11 May, 2016 1 commit
-
-
Long Nguyen authored
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_snippets_tab_under_user_profile
-
- 10 May, 2016 30 commits
-
-
Jacob Schatz authored
Restore "r" shortcut Fixes "Reply with Selected Text" shortcut See merge request !4041
-
Robert Speicher authored
Add eager load paths to help prevent dependency load issues with Sidekiq workers _Originally opened at !3545 by @stanhu._ - - - Relevant resources: - https://github.com/mperham/sidekiq/wiki/FAQ#why-doesnt-sidekiq-autoload-my-rails-application-code - https://github.com/mperham/sidekiq/issues/1281#issuecomment-27129904 - http://blog.arkency.com/2014/11/dont-forget-about-eager-load-when-extending-autoload - https://github.com/rails/rails/blob/52ce6ece8c8f74064bb64e0a0b1ddd83092718e1/railties/lib/rails/engine.rb#L472-L479 - https://github.com/rails/rails/blob/v4.2.6/railties/lib/rails/paths.rb Attempts to address #3661, #11896, #12769, #13521, #14131, #14589, #14759, #14825. See merge request !3724
-
Stan Hu authored
Update Ace Editor Upgrading fixes scroll navigation on mobile. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13987 ![scroll](/uploads/fd655fa6033ddc0337080c89c3fbf92f/scroll.gif) See merge request !3823
-
Robert Speicher authored
Fix an issue when filtering merge requests with more than one label Fixes #15529. See merge request !3886
-
Alfredo Sumaran authored
-
Alfredo Sumaran authored
-
Jacob Schatz authored
Add to label ID to response Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15673 See merge request !4023
-
Robert Speicher authored
Remove broken inline runner description edit form This remove inline form for editing runnner's description. It is broken because of missing partial / incorrect response and it also does not make much sense, since we have under 'Edit' button a form that makes it possible to edit more than just a description. See merge request !4095
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Robert Speicher authored
Fix using link to uploads in global snippets Closes #17342, closes #17363 See merge request !4085
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
Closes #17342, closes #17363
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Grzegorz Bizon authored
-
Dmitriy Zaporozhets authored
Hide navbar on mobile Part of #14838 Closes #17323 <img src="/uploads/33d2dbc17e94329891108c4e80d4aff3/nav.gif" width="800px"> See merge request !4103
-
Dmitriy Zaporozhets authored
-
Rémy Coutable authored
Support multi-line tag messages _Originally opened at !2853 by @clns._ - - - Tag messages in Git can include a short summary of what changes are included in a release and any other relevant information. So I think GitLab should support multi-line tag messages, both in the "New Tag" interface and when viewing the tag. Also a non-technical user could use GitLab's interface to create releases, but at the moment this is impossible because he cannot enter a multi-line message. This would've been very handy, otherwise he would need to do it from the command line or other GUI program, which is not something a non-technical user has access to or knows how to do. This merge request adds support for multi-line tag messages. Below are the impacted screens. Let me know if I should change anything. This would close #3690 and #2460 ![image](/uploads/d33bede1141bfb10c5d9c301ee1cb0ec/image.png) ![image](/uploads/ebfea358c1a5986e7b95ad31748f7a6a/image.png) See merge request !3833
-
Rémy Coutable authored
- Fix naming of API::CommitStatuses - Ensure we use require_dependency instead of require - Ensure the namespace is right in lib/api/api.rb, otherwise, we might require Grape::API::Helpers which defines the `#params` method. This is to avoid requiring a file multiple times and getting an "Already initialized constant" error. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Stan Hu authored
Attempts to address #13521, #14825 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Rémy Coutable authored
Revert "Merge branch 'wiki-fix' into 'master'" This reverts commit 4cc85a58 (!4026), reversing changes made to 90ae445b. From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4026#note_11719950: > 1. On Ruby 2.1.x, the [`uri.path = ::File.join(project_wiki_base_path, uri.path)`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/banzai/filter/wiki_link_filter.rb#L39) raises an `URI::InvalidComponentError: bad component(expected relative path component): http://bar.com/baz` error in `Banzai::Filter::WikiLinkFilter#rebuild_wiki_uri`, which is then rescued in [`Banzai::Filter::WikiLinkFilter#process_link_attr`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/banzai/filter/wiki_link_filter.rb#L34), thus the link is not modified and the tests pass. 1. On Ruby 2.2.x, the same line doesn't raise an error anymore, thus tests are broken on Ruby 2.2 only. I didn't really understand yet why having absolute links in the wiki would break some tests vs having relative links as before, but I think the safest course to action is to revert this MR and to find another fix (probably just prepending `ProjectWiki#wiki_base_path` with the relative URL path component if we are in the case of a relative URL... /cc @artem-sidorenko Just a FYI note: no need to pick into `8-7-stable` since the original commit was not picked. See merge request !4105
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Calin Seciu authored
-
Yorick Peterse authored
Remove the annotate gem and delete old annotations In 8278b763 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382 /cc @yorickpeterse See merge request !4099
-
Rémy Coutable authored
This reverts commit 4cc85a58, reversing changes made to 90ae445b. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Jeroen van Baarsen authored
-
Long Nguyen authored
-
Annabel Dunstone authored
-
Robert Speicher authored
Allow Redmine issue references to work as intended Closes #14527 and #14894 See merge request !4048
-
- 09 May, 2016 9 commits
-
-
Annabel Dunstone authored
-
Benedikt Huss authored
-
Robert Speicher authored
Use a case-insensitive check to compare URI schemes Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/17299 See merge request !1965
-
Achilleas Pipinellis authored
Revert "Merge branch 'patch-1' into 'master'" This reverts merge request !4030. /cc @stanhu @axil @aral See merge request !4097
-
Stan Hu authored
Closes #1625
-
Douwe Maan authored
Fix adding a todo for private group memebers See merge request !4081
-
Robert Speicher authored
Add if exists to drop command Add `IF EXISTS` as a precaution. Related to gitlab-org/gitlab-ce!4020 See merge request !4100
-
Drew Blessing authored
-
Jeroen van Baarsen authored
In 8278b763 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382
-