Dmitriy Zaporozhets
314ef63014
Fix project index
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-07 16:13:31 +02:00
Rémy Coutable
3f02914460
Complete and improve specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 14:58:40 +01:00
Rodolfo Santos
1db9f826c1
Add setting to only allow merge requests to be merged when all discussions are resolved
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 14:58:40 +01:00
Adam Niedzielski
f6cff8f7bc
Fix relative links in Markdown wiki when displayed in "Project" tab
...
Refers to #23806 .
2016-11-01 10:18:49 +01:00
Phil Hughes
07e4ffd708
Fixed boards store spec
2016-10-28 13:54:36 +01:00
Phil Hughes
a2e9bc3584
Delete issue board welcome cookie when project is new
2016-10-28 13:54:36 +01:00
Felipe Artur
da07c2e4d3
Add visibility level to project repository
2016-10-17 18:12:18 -02:00
Rémy Coutable
56259155d5
Small improvements thanks to Robert's feedback
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-09-30 12:02:54 +02:00
James Lopez
29141ed3ea
fix broken repo 500 errors in UI and added relevant specs
2016-09-29 16:58:14 +02:00
Felipe Artur
892dea6771
Project tools visibility level
2016-09-01 11:47:59 -03:00
Patricio Cano
cf37d623e1
Renamed `enable_lfs` to `lfs_enabled` for the Project field, and related fixes.
2016-08-30 17:17:45 -05:00
Patricio Cano
9d8fbcc038
Added project specific enable/disable setting for LFS
2016-08-30 16:17:41 -05:00
winniehell
ddbdf4e609
Restore get_id in ExtractsPath
2016-08-24 12:54:16 +02:00
Sean McGivern
1a7c293c2d
Fix file links on project page Files view
2016-08-23 11:01:20 +01:00
Douwe Maan
8b8a4626c6
Fix specs and implement fixes based on failing specs
2016-08-17 17:54:24 -05:00
Douwe Maan
5a07b760df
Refactor slash command definition
2016-08-12 20:17:18 -05:00
Rémy Coutable
f393f2dde0
Simplify the slash commands DSL to store action blocks instead of creating methods
...
Other improvements:
- Ensure slash commands autocomplete doesn't break when noteable_type is not given
- Slash commands: improve autocomplete behavior and /due command
- We don't display slash commands for note edit forms.
- Add tests for reply by email with slash commands
- Be sure to execute slash commands after the note creation in Notes::CreateService
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-08-13 00:36:47 +02:00
Rémy Coutable
65349c2212
Make slash commands contextual
...
- Return only slash commands that make sense for the current noteable
- Allow slash commands decription to be dynamic
Other improvements:
- Add permission checks in slash commands definition
- Use IssuesFinder and MergeRequestsFinder
- Use next if instead of a unless block, and use splat operator instead of flatten
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-08-13 00:06:12 +02:00
Rémy Coutable
0eea8c8857
Support slash commands in noteable description and notes
...
Some important things to note:
- commands are removed from noteable.description / note.note
- commands are translated to params so that they are treated as normal
params in noteable Creation services
- the logic is not in the models but in the Creation services, which is
the right place for advanced logic that has nothing to do with what
models should be responsible of!
- UI/JS needs to be updated to handle notes which consist of commands
only
- the `/merge` command is not handled yet
Other improvements:
- Don't process commands in commit notes and display a flash is note is only commands
- Add autocomplete for slash commands
- Add description and params to slash command DSL methods
- Ensure replying by email with a commands-only note works
- Use :subscription_event instead of calling noteable.subscribe
- Support :todo_event in IssuableBaseService
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-08-13 00:05:57 +02:00
Christopher Bartz
ecb3f1eb6c
Rename `markdown_preview` routes to `preview_markdown`
2016-08-11 15:54:18 +02:00
Stan Hu
4955a47cb1
Clean up project destruction
...
Instead of redirecting from the project service to the service and back to the model,
put all destruction code in the service. Also removes a possible source of failure
where run_after_commit may not destroy the project.
2016-08-10 09:28:21 -07:00
Stan Hu
9eb100241e
Clarify which project is deleted to avoid alarm
...
Closes #13654
2016-07-29 16:23:13 -07:00
Felipe Artur
4d69cb9d94
Allow to disable user request access to groups/projects
2016-07-20 14:38:21 +02:00
Sean McGivern
87035c2945
Don't blow up in tree view on empty repo
2016-07-18 14:06:21 +01:00
Grzegorz Bizon
c6f9a1c273
Enable Style/IdenticalConditionalBranches Rubocop cop
2016-07-08 11:04:04 +02:00
Paco Guzman
0601ce1871
Avoid instantiation of a Git::Tree
...
Only needed when the project view is ‘Files view’
2016-06-29 17:56:15 +02:00
Paco Guzman
79c521f5df
Provide default branch/file path for ProjectsController#show
2016-06-20 21:44:22 +02:00
Phil Hughes
f112e2a1da
Fixed issue with returning ref in commits JSON
...
Added tests to project controller
2016-06-20 11:37:27 +01:00
Phil Hughes
c240cad59a
Fixed Ruby to use exclude
2016-06-18 21:49:20 +01:00
Phil Hughes
68c9981013
Correctly adds commit ID into dropdown
...
Removes un-used method
Fixes other Ruby issues
2016-06-18 21:49:20 +01:00
Phil Hughes
3c8c912965
Pulls back tags if any exist
2016-06-18 21:49:20 +01:00
Phil Hughes
d2362e2edf
Tests fix for ref switcher
2016-06-18 21:49:20 +01:00
Phil Hughes
deca5ef200
Refs dropdown is now loaded async
2016-06-18 21:49:20 +01:00
Douwe Maan
9b7fd74805
Merge branch 'feature/project-export' into 'master'
...
Export project functionality
This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050 , which adds the ability to export single projects.
- [x] members
- DB data
- [x] issues
- [x] issue comments
- [x] merge requests
- [x] merge request diff
- [x] merge request comments
- [x] labels
- [x] milestones
- [x] snippets
- [x] releases
- [x] events
- [x] commit statuses
- [x] CI builds
- File system data
- [x] Git repository
- [x] wiki
- [x] uploads
- [ ] ~~CI build traces~~
- [ ] ~~CI build artifacts~~
- [ ] ~~LFS objects~~
- DB configuration
- [x] services
- [x] web hooks
- [x] protected branches
- [x] deploy keys
- [x] CI variables
- [x] CI triggers
See merge request !3114
2016-06-17 15:35:27 +00:00
James Lopez
2d4556c5d2
a few changes based on MR feedback
2016-06-17 15:47:00 +02:00
James Lopez
4bde59341f
lots of refactoring again based on feedback. Changed the UI slightly and also fixed a small bug
2016-06-15 17:31:00 +02:00
James Lopez
36ccaca35a
project export archiver
2016-06-14 22:11:21 +02:00
James Lopez
9ecebaaea1
adding notifications stuff and more refactoring for exporting projects
2016-06-14 16:31:03 +02:00
James Lopez
3f7ed55011
lots of refactoring to reuse import service
2016-06-14 12:47:07 +02:00
Fatih Acet
046b5735bc
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into add_autocomplete_for_labels
...
# Conflicts:
# app/assets/javascripts/gfm_auto_complete.js.coffee
2016-06-14 00:56:59 +03:00
James Lopez
e83fc684a5
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
...
# Conflicts:
# Gemfile.lock
# app/helpers/todos_helper.rb
# app/models/todo.rb
# app/views/projects/edit.html.haml
# lib/gitlab/import_export/import_service.rb
2016-06-13 14:00:19 +02:00
Rui Anderson
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
Z.J. van de Weg
9d491712cf
Merge branch 'master' into awardables
2016-06-03 15:20:11 +02:00
Yorick Peterse
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
ZJ van de Weg
7ae536002a
Merge branch 'master' into awardables
2016-05-25 14:41:25 +02:00
Douwe Maan
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 f7348cd348
did for labels
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829
See merge request !3897
2016-05-20 21:08:57 +00:00
Rémy Coutable
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
Fatih Acet
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
Felipe Artur
c2c7014e01
Improve documentation and add changelog
2016-05-17 21:53:04 -05:00
Felipe Artur
07ff874f57
Let users set notification levels in projects which they are not members
2016-05-17 21:53:03 -05:00
James Lopez
8c508037a6
updated controllers with permissions check
2016-05-13 17:03:03 +02:00
Kamil Trzcinski
0094d8f196
Rename `images` to `container_registry`
2016-05-09 20:29:57 +03:00
Zeger-Jan van de Weg
3bdc57f0a7
Create table for award emoji
2016-05-06 10:47:11 +02:00
James Lopez
bd2ebf37e6
use worker in controller
2016-05-04 10:57:09 +02:00
Arinde Eniola
14964308dc
add gfm autocomplete for labels
2016-05-03 12:07:06 +01:00
Kamil Trzcinski
03b3fe13f6
Make images_enabled configurable
2016-04-29 16:45:00 +02:00
James Lopez
c5bc262981
few fixes - import from UI working
2016-04-28 18:00:30 +02:00
James Lopez
a0ede57dd6
Merge branches 'feature/project-export' and 'feature/project-import' into feature/project-export-ui-experimental
2016-04-22 15:29:35 +02:00
Alejandro Rodríguez
4cab66e3e2
Implementing autocomplete for GFM milestone references
2016-04-20 22:12:43 -03:00
James Lopez
05edd5e6dc
download export now working
2016-04-15 15:38:34 +02:00
James Lopez
41163fd552
some experimental UI stuff to test export
2016-04-14 18:01:21 +02:00
Douglas Barbosa Alexandre
635b65d120
Add method to return the user notification setting for a group, or a project
2016-04-08 18:46:45 -03:00
Douglas Barbosa Alexandre
ee497599cc
Use default_value_for to set default NotificationSetting#level
2016-04-08 17:24:27 -03:00
Douglas Barbosa Alexandre
7afeace354
Merge branch 'master' into decouple-member-notification
2016-04-08 15:48:09 -03:00
Stan Hu
934f1e9097
Fix Error 500 after renaming a project path
...
Closes #14885
2016-04-05 11:18:13 -07:00
Douwe Maan
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
Yorick Peterse
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
Dmitriy Zaporozhets
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
Dmitriy Zaporozhets
71e7b39843
Refactor creating notification setting with defaults
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-30 10:44:20 +02:00
Dmitriy Zaporozhets
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
Baldinof
fa4126acff
Move unlink fork logic to a service
2016-03-22 15:34:35 +01:00
Douwe Maan
8db1292139
Tweaks, refactoring, and specs
2016-03-20 21:04:07 +01:00
Douglas Barbosa Alexandre
7ee528336a
Restrict access for confidential issues on autocomplete
2016-03-17 20:55:59 -03:00
Jacob Vosmaer
30b36c92c3
Use an exception to pass messages
2016-03-15 11:03:43 +01:00
Baldinof
436caf4e8b
Merge branch 'master' into fix_remove_fork_link
2016-03-14 21:51:06 +01:00
Jacob Vosmaer
a02fe251df
Allow project housekeeping only once an hour
2016-03-14 15:55:45 +01:00
Stan Hu
74d7de8196
Revert "Revert "Merge branch 'support-go-subpackages' into 'master'
""
...
This reverts commit 5a586f364c
2016-03-12 21:05:23 +00:00
Douwe Maan
5a586f364c
Revert "Merge branch 'support-go-subpackages' into 'master'
"
...
This reverts merge request !3191
2016-03-12 17:42:51 +00:00
Stan Hu
2563213ccf
Remove existing go_import.html.haml implementation
2016-03-12 07:49:16 -08:00
Baldinof
e8c723543c
Close merge requests when removing fork relation
2016-03-11 21:37:57 +01:00
Robert Speicher
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
Kamil Trzcinski
b4c36130cc
Rename allow_guest_to_access_builds to public_builds
2016-02-04 12:57:46 +01:00
Kamil Trzcinski
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
Josh Frye
91b9cbff8d
First pass at deleting projects in the background.
2016-01-29 09:14:16 -05:00
Jeroen Nijhof
9b28220f88
Merge gitlab.com:gitlab-org/gitlab-ce
2016-01-06 14:55:44 +01:00
Douwe Maan
43a3a401bd
Merge branch 'master' into mention-all
2015-12-24 20:34:19 +01:00
Douwe Maan
672cbbff95
Only allow group/project members to mention `@all`
2015-12-24 15:33:51 +01:00
Jacob Schatz
011a7a3297
adds starring and unstarring text to star button, also adds partial new styles
2015-12-23 12:26:50 -05:00
Kamil Trzcinski
513d551c8f
Fix after column rename
2015-12-11 18:02:10 +01:00
Kamil Trzcinski
e80e3f5372
Migrate CI::Project to Project
2015-12-11 18:02:09 +01:00
Stan Hu
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
Jeroen Nijhof
d4690af8bc
Use GitlabShellWorker.perform_async for housekeeping
2015-11-19 16:04:07 +01:00
Jeroen Nijhof
839aae0e47
Added housekeeping status and moved path check to gitlab-shell
2015-11-19 15:16:54 +01:00
Marin Jankovski
14032d8eb1
Add support for git lfs.
2015-11-16 12:39:13 +01:00
Kamil Trzcinski
6384c757b7
Expose CI enable option in project features
...
- Enable CI by default for all new projects
2015-11-13 10:52:50 +01:00
KON YUICHI
31723eb9f0
fix deprecated
2015-10-31 22:32:06 +09:00
kazubu
0bfb9cbf38
modify to use redirect_back_or_default function
2015-10-26 15:06:55 +09:00
kazubu
c3d48f9735
Fix: 500 error returned if destroy request without HTTP referer
2015-10-26 15:06:55 +09:00
Jeroen Nijhof
4f0a38f1a8
Added housekeeping for git repositories
2015-10-21 15:15:54 +02:00
Douwe Maan
f9cd0639c1
Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-button
...
[ci skip]
2015-10-19 13:49:52 +02:00
Douwe Maan
157d891615
Add changelog item
2015-10-19 11:40:13 +02:00
Douwe Maan
8adeda37b5
Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into 'master'
...
Add ability to remove the fork relationship from project settings


Replaces !1579 .
Fixes #2578 .
See merge request !1636
2015-10-19 09:32:07 +00:00
Douwe Maan
42cbc7f813
Tweak wording.
2015-10-18 12:38:01 +02:00
Douwe Maan
99b8568ff7
Find correct group membership.
2015-10-18 12:19:30 +02:00
Douwe Maan
ff866faf2f
Only load tree when project has repository to prevent 404
2015-10-18 11:22:33 +02:00
Douwe Maan
6bd9a9fbf7
Set vars used by tree view in project show action.
2015-10-17 19:16:40 +02:00
Han Loong Liauw
0bea5ced8b
Made suggested content changes based on MR Review
...
Changed the authentication method for removing fork through API
Reflected changes to new auth method in API specs
2015-10-14 20:19:41 +11:00
Han Loong Liauw
df99ddbba1
Adds ability to remove the forked relationship
...
This was previously possible through the API but can now be done
through the project#edit settings screen if the current user is
the owner of the project.
Update changelog
2015-10-13 21:42:17 +11:00
Grzegorz Bizon
b8f5e7427f
Show notifications button even if user is not member of a project
...
Notifications button was unavailable if user wasn't member of the
project, even if protected project is available via group privileges.
Showing disabled button with explanation tool-tip is less confusing.
This closes #2846 .
2015-10-12 12:07:31 +02:00
Cristian Bica
c528043439
Allow users to select the Files view as default project view
2015-10-01 17:05:20 +03:00
Douwe Maan
47e926bec0
Minor code cleanup
2015-09-20 19:09:43 +02:00
Patricio Cano
23f9a64566
Use the `find_by_user_id` magic finder instead of `where`.
2015-09-16 21:02:40 -05:00
Patricio Cano
1ef2ce95d5
Merge branch 'master' into notification-levels
2015-09-16 19:52:57 -05:00
Patricio Cano
01cc20378b
Notification dropdown now shows currently active level, and also shows what the actual value of `global` is, if the project has the notification level set to global.
2015-09-14 20:33:24 -05:00
Patricio Cano
adcae6ebd5
Notification level can now be saved from within the project view.
2015-09-14 19:27:54 -05:00
Darby
84508c40b7
PAtrially working notification button
2015-09-14 16:37:11 -07:00
Douwe Maan
f87f6480b2
Use new routing helper
2015-09-08 17:53:16 +01:00
Douwe Maan
1489d225d6
Move partial to right place and fix tests.
2015-09-08 15:14:14 +01:00
Douwe Maan
5d785457db
Clean up overlap between dashboard and explore.
...
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
2015-09-08 14:49:20 +01:00
Achilleas Pipinellis
0fac66f84d
Mention group and project name in flash messages upon create, update and delete.
2015-07-30 01:22:16 +03:00
Valery Sizov
c61e7dd4ac
Public project activity page asks for sign-in
2015-07-20 13:54:56 +03:00
Douwe Maan
b93053695a
Fix transferring of project to another group using the API.
2015-07-11 16:47:33 -04:00
Dmitriy Zaporozhets
f0e1da04f0
Show last push widget on several project pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 23:21:35 +02:00
Dmitriy Zaporozhets
c2f02fc1a4
Refactor star and fork buttons
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 12:25:34 +02:00
Dmitriy Zaporozhets
d192f921c1
Move project activity to separate tab. Add more features to project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-07 16:01:12 +02:00
Douwe Maan
4ae67fcaef
Show warning when a comment will add 10 or more people to the discussion.
2015-06-05 12:07:13 +02:00
Dmitriy Zaporozhets
97ff86e07c
Move repository when project is removed
...
Ths commit does next:
* When we remove project we move repository to path+deleted.git
* Then we schedule removal of path+deleted with sidekiq
* If repository move failed we abort project removal
This should help us with NFS issue when project get removed but
repository stayed. The full explanation of problem is below:
* rm -rf project.git
* rm -rf removes project.git/objects/foo
* NFS server renames foo to foo.nfsXXXX because some NFS client (think
* Unicorn) still has the file open
* rm -rf exits, but project.git/objects/foo.nfsXXX still exists
* Unicorn closes the file, the NFS client closes the file (foo), and the
* NFS server removes foo.nfsXXX
* the directory project.git/objects/ still exists => problem
So now we move repository and even if repository removal failed
Repository directory is moved so no bugs with project removed but
repository directory taken. User still able to create new project with
same name. From administrator perspective you can easily find stalled
repositories by searching `*+deleted.git`
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-03 13:05:43 +02:00
Douwe Maan
92fd3ccee0
Add helpers for header title and sidebar, and move setting those from controllers to layouts.
2015-05-01 10:39:16 +02:00
Douwe Maan
26ad250989
Add a page title to every page.
2015-04-30 19:12:15 +02:00
Douwe Maan
a6dfd065ca
Add atom feed for project activity.
2015-04-23 17:11:39 +02:00
Jeroen van Baarsen
5a4ebfb47a
Fixed the Rails/ActionFilter cop
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
Dmitriy Zaporozhets
d2d709a252
Update html-pipeline and emoji
2015-03-11 16:05:01 -07:00
Dmitriy Zaporozhets
4b1bb42bf7
Fix tests for project removing
2015-03-10 21:56:19 -07:00
Douwe Maan
3702c4ad80
Render go-import meta tag for private repos.
2015-03-03 11:22:30 +01:00
Dmitriy Zaporozhets
1da71cc520
Introduce shortcuts for routing helpers
2015-02-25 19:34:16 -08:00
Douwe Maan
5f7a3e1bbd
Merge branch 'master' into extend_markdown_upload
...
# Conflicts:
# app/controllers/files_controller.rb
2015-02-25 11:59:25 +01:00
Douwe Maan
0283fff591
Merge branch 'master' into extend_markdown_upload
...
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
2015-02-24 14:54:39 +01:00
DJ Mountney
746dd89ab0
Fix 404 when deleting a project
...
The deletion from the admin section was redirecting to the wrong address.
2015-02-23 16:19:03 -08:00
Douwe Maan
218283b368
Merge branch 'extend_markdown_upload' into generic-uploads
...
# Conflicts:
# app/controllers/files_controller.rb
# app/controllers/projects/uploads_controller.rb
# app/uploaders/attachment_uploader.rb
2015-02-20 15:37:37 +01:00
Vinnie Okada
9e9ce95d62
Merge branch 'master' into rails-4.1.9
...
Conflicts:
app/views/dashboard/_project.html.haml
app/views/events/event/_common.html.haml
app/views/explore/projects/_project.html.haml
app/views/groups/_projects.html.haml
app/views/projects/_home_panel.html.haml
app/views/projects/_issues_nav.html.haml
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_show.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/notes/_edit_form.html.haml
app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets
63f11a68c5
Fix event loading with associations
2015-02-18 09:38:46 -08:00
Dmitriy Zaporozhets
a8a328b151
DB performance improvements to GitLab
2015-02-18 00:16:42 -08:00
Douwe Maan
d2ebdf664b
Refactor.
2015-02-17 22:23:31 +01:00
Hannes Rosenögger
9bf8480b4a
Generalize the image upload in markdown
...
This commit generalizes the image upload via drag and drop so it supports all files.
It also adds access control for these files.
2015-02-17 22:20:44 +01:00
Vinnie Okada
76aad9b76e
Upgrade to Rails 4.1.9
...
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Douwe Maan
9910b7ff99
Allow groups to be mentioned.
...
Resolves #1673 .
2015-02-05 19:10:52 +01:00
Hannes Rosenögger
70c44a0da2
Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable
2015-01-24 18:51:16 +01:00
Dmitriy Zaporozhets
893a68baf3
Cache autocomplete or emojis
2015-01-23 16:17:27 -08:00
Dmitriy Zaporozhets
a42d84eca3
Faster autocomplete without unused description
2015-01-23 14:38:20 -08:00
Dmitriy Zaporozhets
1511999d88
Faster autocomplete for users/issues/emojiis
...
Instead of loading all issues and merge requests we load only open one.
This will reduce time load for autocomplete resources significantly
2015-01-22 17:51:35 -08:00