07dbd6b388
Allow or not merge MR with failed build
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 14:36:54 +02:00
9d491712cf
Merge branch 'master' into awardables
2016-06-03 15:20:11 +02:00
86166d2802
Split Markdown rendering & reference gathering
...
This splits the Markdown rendering and reference extraction phases into
two distinct code bases. The reference extraction phase no longer relies
on the html-pipeline Gem (and any related code) and allows for
extracting of references from multiple HTML nodes in a single pass. This
means that if you want to extract user references from 200 comments you
no longer need to run 200 times N number of queries, instead only a
handful of queries may be needed.
2016-05-26 17:14:00 +02:00
7ae536002a
Merge branch 'master' into awardables
2016-05-25 14:41:25 +02:00
ba5b47c2e3
Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master'
...
Implement special GitLab markdown reference for milestones
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions:
- Move changelog item to 8.8
- Fix cross-project milestone ref with invalid project, like f7348cd348https://gitlab.com/gitlab-org/gitlab-ce/issues/13829
See merge request !3897
2016-05-20 21:08:57 +00:00
f29d8b64e4
Merge remote-tracking branch 'origin/master' into eReGeBe/gitlab-ce-feature/milestone-md
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-18 23:40:33 -05:00
bb883387f9
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
...
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/models/note.rb
# db/schema.rb
# spec/models/note_spec.rb
2016-05-18 13:05:53 -05:00
c2c7014e01
Improve documentation and add changelog
2016-05-17 21:53:04 -05:00
07ff874f57
Let users set notification levels in projects which they are not members
2016-05-17 21:53:03 -05:00
0094d8f196
Rename `images` to `container_registry`
2016-05-09 20:29:57 +03:00
3bdc57f0a7
Create table for award emoji
2016-05-06 10:47:11 +02:00
03b3fe13f6
Make images_enabled configurable
2016-04-29 16:45:00 +02:00
4cab66e3e2
Implementing autocomplete for GFM milestone references
2016-04-20 22:12:43 -03:00
635b65d120
Add method to return the user notification setting for a group, or a project
2016-04-08 18:46:45 -03:00
ee497599cc
Use default_value_for to set default NotificationSetting#level
2016-04-08 17:24:27 -03:00
7afeace354
Merge branch 'master' into decouple-member-notification
2016-04-08 15:48:09 -03:00
934f1e9097
Fix Error 500 after renaming a project path
...
Closes #14885
2016-04-05 11:18:13 -07:00
f505c753b0
Merge branch 'fix_remove_fork_link' into 'master'
...
Remove fork link closes all merge requests opened on source project
Currently, if you:
- create a fork
- open a merge request on the source project
- remove the fork link
The created MR cannot be closed.
With this MR, all pending MR is closed when the fork link is removed.
See merge request !3189
2016-04-04 15:37:08 +00:00
5830d80b8d
Pre-calculate Emoji digests
...
By pre-calculating the digests we can manually construct the emoji URLs,
removing the need for using Rails' asset URL helpers. The reason we
don't want to use these helpers for Emojis is two-fold:
1. Rails' image_url() method is slow, really slow. For one it _might_
have to calculate digests but it also performs a lot of other
intensive operations (judging by the source code and based on
measuring timings).
2. We have a lot of Emoji which coupled with the above can result in it
taking minutes to load Emoji autocomplete data.
Using this pre-calculation setup generating the digests takes around 7
seconds (including the time it takes to start Rails/Rake), and only
around 600 milliseconds to load _all_ the autocomplete data of a project
(measured locally).
This commit _does_ change the Emoji URLs from absolute to relative URLs
as these are much easier to generate.
To update the Emoji data simply run:
rake gemojione:digests
Then commit any changes.
Fixes gitlab-org/gitlab-ce#14009
2016-03-30 19:29:17 +02:00
5583197e09
Create NotificationSettings object only when user change value in dropdown
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
71e7b39843
Refactor creating notification setting with defaults
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
359157c097
Introduce NotificationSetting to user interface
...
* visiting project will create notification setting if missing
* change notification setting per project even without membership
* use notification settings instead of membership on profile page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
fa4126acff
Move unlink fork logic to a service
2016-03-22 15:34:35 +01:00
8db1292139
Tweaks, refactoring, and specs
2016-03-20 21:04:07 +01:00
7ee528336a
Restrict access for confidential issues on autocomplete
2016-03-17 20:55:59 -03:00
30b36c92c3
Use an exception to pass messages
2016-03-15 11:03:43 +01:00
436caf4e8b
Merge branch 'master' into fix_remove_fork_link
2016-03-14 21:51:06 +01:00
a02fe251df
Allow project housekeeping only once an hour
2016-03-14 15:55:45 +01:00
74d7de8196
Revert "Revert "Merge branch 'support-go-subpackages' into 'master'
""
...
This reverts commit 5a586f364c
2016-03-12 21:05:23 +00:00
5a586f364c
Revert "Merge branch 'support-go-subpackages' into 'master'
"
...
This reverts merge request !3191
2016-03-12 17:42:51 +00:00
2563213ccf
Remove existing go_import.html.haml implementation
2016-03-12 07:49:16 -08:00
e8c723543c
Close merge requests when removing fork relation
2016-03-11 21:37:57 +01:00
fe13f58f3e
Update Emoji asset path
...
Now that we're serving assets directly from the Gemojione gem's path,
the images are not in an `emoji/` sub-folder.
2016-02-12 15:34:20 -05:00
b4c36130cc
Rename allow_guest_to_access_builds to public_builds
2016-02-04 12:57:46 +01:00
627909c2a4
Add CI setting: allow_guest_to_access_builds
...
Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
2016-02-02 17:59:37 +01:00
91b9cbff8d
First pass at deleting projects in the background.
2016-01-29 09:14:16 -05:00
9b28220f88
Merge gitlab.com:gitlab-org/gitlab-ce
2016-01-06 14:55:44 +01:00
43a3a401bd
Merge branch 'master' into mention-all
2015-12-24 20:34:19 +01:00
672cbbff95
Only allow group/project members to mention `@all`
2015-12-24 15:33:51 +01:00
011a7a3297
adds starring and unstarring text to star button, also adds partial new styles
2015-12-23 12:26:50 -05:00
513d551c8f
Fix after column rename
2015-12-11 18:02:10 +01:00
e80e3f5372
Migrate CI::Project to Project
2015-12-11 18:02:09 +01:00
2497d3d550
Fix 404 in redirection after removing a project
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9844
Closes #3559
2015-11-25 23:11:35 -08:00
d4690af8bc
Use GitlabShellWorker.perform_async for housekeeping
2015-11-19 16:04:07 +01:00
839aae0e47
Added housekeeping status and moved path check to gitlab-shell
2015-11-19 15:16:54 +01:00
14032d8eb1
Add support for git lfs.
2015-11-16 12:39:13 +01:00
6384c757b7
Expose CI enable option in project features
...
- Enable CI by default for all new projects
2015-11-13 10:52:50 +01:00
31723eb9f0
fix deprecated
2015-10-31 22:32:06 +09:00
0bfb9cbf38
modify to use redirect_back_or_default function
2015-10-26 15:06:55 +09:00
c3d48f9735
Fix: 500 error returned if destroy request without HTTP referer
2015-10-26 15:06:55 +09:00
Rui Anderson
Z.J. van de Weg
Yorick Peterse
Douwe Maan
Rémy Coutable
Fatih Acet
Felipe Artur
Kamil Trzcinski
Alejandro Rodríguez
Douglas Barbosa Alexandre
Stan Hu
Dmitriy Zaporozhets
Baldinof
Douwe Maan
Jacob Vosmaer
Robert Speicher
Josh Frye
Jeroen Nijhof
Jacob Schatz
Marin Jankovski
KON YUICHI
kazubu