Dmitriy Zaporozhets
|
6350b32a3d
|
Fix security issues with teams
|
2013-01-25 15:51:45 +02:00 |
|
|
Dmitriy Zaporozhets
|
aa1f1eb680
|
Merge pull request #2746 from gitlabhq/features/teams
New feature: Teams
|
2013-01-25 00:46:20 -08:00 |
|
|
Dmitriy Zaporozhets
|
ac8247b46d
|
Improved search. added filters
|
2013-01-25 10:07:21 +02:00 |
|
Andrey Kumanyaev
|
d721863382
|
Fix little bugs
|
2013-01-24 22:31:48 +02:00 |
|
|
Andrey Kumanyaev
|
31d84d71d3
|
assign team to project from project page in public section
|
2013-01-24 22:31:48 +02:00 |
|
|
Andrey Kumanyaev
|
f87b76a805
|
refactoring user team in public section
|
2013-01-24 22:31:25 +02:00 |
|
|
Andrey Kumanyaev
|
f6f414ce3b
|
refactoring project team members controller (corresponding mental model)
|
2013-01-24 22:31:25 +02:00 |
|
|
Andrey Kumanyaev
|
b7470440ff
|
Move team project management to own controller
|
2013-01-24 22:31:24 +02:00 |
|
|
Andrey Kumanyaev
|
cca9935970
|
save generated files
|
2013-01-24 22:31:24 +02:00 |
|
|
Andrey Kumanyaev
|
a987f1469e
|
commit user team helper
|
2013-01-24 22:31:24 +02:00 |
|
|
Dmitriy Zaporozhets
|
f6c482c06f
|
User can create group
|
2013-01-24 17:47:09 +02:00 |
|
|
Dmitriy Zaporozhets
|
70690e1971
|
base implementation
|
2013-01-22 19:05:01 +02:00 |
|
Riyad Preukschas
|
8a5b770c36
|
Reorder help routes
|
2013-01-19 15:26:23 +01:00 |
|
|
Riyad Preukschas
|
8db80f1f6d
|
Rename help#public_area to help#public_access
|
2013-01-19 15:24:51 +01:00 |
|
GitLab
|
232d61d598
|
Refactor project creation. Added logout link to profile page
|
2013-01-17 17:35:57 +02:00 |
|
|
Dmitriy Zaporozhets
|
2e9c0e2b47
|
switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment
|
2013-01-17 22:35:45 +02:00 |
|
|
Riyad Preukschas
|
16b5417842
|
Use image Urls for Emoji in GFM
Fixes #2617
|
2013-01-16 22:39:45 +01:00 |
|
|
Dmitriy Zaporozhets
|
08426d336d
|
Merge pull request #2538 from jouve/app_helper
clean application_helper a bit
|
2013-01-16 04:59:29 -08:00 |
|
|
Dmitriy Zaporozhets
|
f598cc7897
|
change logic on line_code
|
2013-01-15 11:12:17 +02:00 |
|
|
Riyad Preukschas
|
bda7fe38d0
|
Merge branch 'master' into discussions
|
2013-01-15 00:53:00 +01:00 |
|
|
Riyad Preukschas
|
3022786948
|
Merge commit 'master' into discussions
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
|
2013-01-15 00:52:25 +01:00 |
|
|
Riyad Preukschas
|
b3bfb75252
|
Fix link_to_member to not be bold by default
|
2013-01-11 20:16:37 +01:00 |
|
|
Dmitriy Zaporozhets
|
abc2bdc3aa
|
Remove unused images. More use of font-awesome icons
|
2013-01-10 08:43:25 +02:00 |
|
Cyril
|
8a3bbbdb88
|
clean app helper
* remove unused method
* simplify gravatar_icon
|
2013-01-10 01:46:23 +01:00 |
|
Alex Denisov
|
d7bc121474
|
replace javascript:void with preventDefault
|
2013-01-09 21:02:41 +00:00 |
|
|
Alex Denisov
|
3cc0458312
|
Reloading of events via ajax instead of page reloading.
|
2013-01-09 19:30:20 +00:00 |
|
|
Alex Denisov
|
97d17cf835
|
Event filters stores at cookies.
|
2013-01-09 19:30:20 +00:00 |
|
|
Alex Denisov
|
b255c3c44b
|
Tests on events filtering added
|
2013-01-09 19:30:20 +00:00 |
|
|
Dmitriy Zaporozhets
|
cc64f2a814
|
Common filtering for dashboard and group. Share partial search result partial
|
2013-01-07 20:52:43 +02:00 |
|
|
Dmitriy Zaporozhets
|
dccd8b6eaa
|
Continue refactoring. Use repostory and team
|
2013-01-04 08:43:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
39ba934c0a
|
REpostiry, Team models
|
2013-01-03 21:09:18 +02:00 |
|
|
Dmitriy Zaporozhets
|
d431e43392
|
Fix few bugs and tests after refactoring ownership logic
|
2013-01-02 19:32:34 +02:00 |
|
|
Dmitriy Zaporozhets
|
a16533a04a
|
Add groups to search autocomplete. Use alphabetically scope for users order
|
2012-12-30 13:50:23 +02:00 |
|
|
Dmitriy Zaporozhets
|
c8ba5c2d58
|
Fix routing issues when navigating over tree, commits etc
|
2012-12-25 06:14:05 +03:00 |
|
|
Riyad Preukschas
|
db2c15369c
|
Merge branch 'master' into discussions
Conflicts:
app/assets/stylesheets/main.scss
app/models/project.rb
app/views/notes/_common_form.html.haml
app/views/notes/_per_line_form.html.haml
lib/gitlab/markdown.rb
spec/models/note_spec.rb
|
2012-12-23 01:03:57 +01:00 |
|
|
Riyad Preukschas
|
757c7a5291
|
Fix gravatar and ldap config
|
2012-12-20 16:54:28 +01:00 |
|
|
Riyad Preukschas
|
19eb637419
|
Update uses of Gitolite.config.foo settings
|
2012-12-20 16:54:28 +01:00 |
|
|
Dmitriy Zaporozhets
|
4b02f4a22d
|
show production.log, show only active milestone for issue filter
|
2012-12-19 07:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
85d5f606f6
|
Labels autocomplete
|
2012-12-18 06:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
03369a9165
|
Use one helper for linking to team member. More clear title for Issue and MR
|
2012-12-13 06:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
d7eb314553
|
Project titles with namespaces
|
2012-12-12 12:02:29 +02:00 |
|
|
Dmitriy Zaporozhets
|
ca936d2784
|
Improve CI integration for merge requests
|
2012-12-11 06:14:05 +03:00 |
|
|
Riyad Preukschas
|
20c8d6e644
|
Merge pull request #2222 from jojosch/add-test-help-raketasks
add help/raketasks to routing spec and search autocomplete
|
2012-12-10 05:38:14 -08:00 |
|
|
Dmitriy Zaporozhets
|
f4d9059b7e
|
Show project with namespace in feeds
|
2012-12-09 10:56:15 +02:00 |
|
Johannes Schleifenbaum
|
3a48177762
|
add help raketasks to search autocomplete
|
2012-12-08 17:35:10 +01:00 |
|
Sergey Linnik
|
0aa7f79ca4
|
allow customize gravatar url
|
2012-12-07 00:44:22 +04:00 |
|
|
Sergey Linnik
|
2c37fa381e
|
fix some glitches in gravatar image url generation
always use proper size value
do not show alt text when avatar image not loaded
|
2012-12-07 00:03:13 +04:00 |
|
|
Dmitriy Zaporozhets
|
674efd38d8
|
Fix 500 error on services page. Fixed active project tab when on services
|
2012-12-05 14:17:40 +02:00 |
|
|
Riyad Preukschas
|
c4a7824a8c
|
Fix wall notes
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
494ae87840
|
Refactor discussion reply
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
ae067ee322
|
Fix vote counting
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
5c2f6d7f05
|
Update notes views to support discussions
|
2012-12-03 22:51:55 +01:00 |
|
|
Riyad Preukschas
|
b91d680257
|
Fix notes helper
|
2012-12-03 22:51:55 +01:00 |
|
|
Dmitriy Zaporozhets
|
c38b9a2f80
|
Filter projects on dashboard
|
2012-11-30 13:40:34 +02:00 |
|
|
Riyad Preukschas
|
184a9ecaf6
|
Add user_color_scheme_class helper
|
2012-11-27 22:51:05 +01:00 |
|
|
Dmitriy Zaporozhets
|
81f8114f24
|
NamespacesHelper
|
2012-11-27 17:48:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
f5551efdfd
|
Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues
|
2012-11-27 09:31:15 +03:00 |
|
|
Dmitriy Zaporozhets
|
cc52eed981
|
Show namespace in search autocomplete
|
2012-11-27 07:29:11 +03:00 |
|
|
Dmitriy Zaporozhets
|
d7c5885c3d
|
Improved Issues and MR filters
|
2012-11-27 07:29:11 +03:00 |
|
|
Dmitriy Zaporozhets
|
ab42370af0
|
Fix sattellites
|
2012-11-21 09:14:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
23734a715e
|
Dashboard filters for events
|
2012-11-21 08:24:05 +03:00 |
|
|
Dmitriy Zaporozhets
|
0e1635a68a
|
Fixing requests after namespaces. Fixed admin bug with access to project
|
2012-11-23 22:25:28 +02:00 |
|
|
Dmitriy Zaporozhets
|
f17ddeb394
|
Make admin project list more useful
|
2012-11-23 07:24:09 +03:00 |
|
|
Dmitriy Zaporozhets
|
2b683b0d0b
|
Ability to create project with namespace
|
2012-11-23 07:11:09 +03:00 |
|
|
Dmitriy Zaporozhets
|
ebcbe0c87b
|
Add status badge for MR
|
2012-11-20 20:34:05 +03:00 |
|
Koen Punt
|
3ac1f9459a
|
Optimized commit diff views, now showing file size and file mode changes
Replaced commit status images (diff_file_*.png) with fontawesome icons
|
2012-11-18 17:41:41 +01:00 |
|
Dmitriy Zaporozhets
|
949233aa1f
|
Changed default icon for gravatar. Moved filter out of layout
|
2012-11-06 13:47:43 +02:00 |
|
|
Dmitriy Zaporozhets
|
f555578414
|
Added EventFilter class. Compeleted first version of dashbaord filtering
|
2012-11-05 20:12:26 +02:00 |
|
Robert Speicher
|
e60185699b
|
Add 'breadcrumbs' helper for Commit breadcrumb links
Closes #1731
|
2012-11-01 17:58:13 -04:00 |
|
|
Dmitriy Zaporozhets
|
d9c20cf5a6
|
Fix 404 errors on Merge Request -> new
|
2012-10-31 14:29:42 +02:00 |
|
|
randx
|
f417a265d7
|
Finalize milestones for Merge Requests
|
2012-10-29 23:45:11 +02:00 |
|
|
randx
|
0189ee97ed
|
Security for online editor. Replace dev_access?, master_access? with can? method usage
|
2012-10-21 12:12:14 +03:00 |
|
|
Riyad Preukschas
|
ce91014730
|
Fix use of Emoji
|
2012-10-18 01:10:35 +02:00 |
|
|
randx
|
453b2ae68b
|
Fix plain text readme
|
2012-10-16 09:43:22 +03:00 |
|
|
Riyad Preukschas
|
b1461de993
|
Make Note methods saner
|
2012-10-13 16:23:12 +02:00 |
|
|
Dmitriy Zaporozhets
|
837972650c
|
Merge pull request #1683 from riyad/fix-events-for-deleted-things-again
Fix displaying events for deleted things on the dashboard (again)
|
2012-10-12 04:56:16 -07:00 |
|
|
Riyad Preukschas
|
19560a4b5f
|
Fix displaying events for deleted things
|
2012-10-12 13:37:44 +02:00 |
|
|
Riyad Preukschas
|
64008b9ec7
|
Improve search suggestions
|
2012-10-12 01:02:28 +02:00 |
|
|
Riyad Preukschas
|
81ee69381d
|
Add links to the note source if the note is mixed in
|
2012-10-10 12:14:48 +02:00 |
|
|
Riyad Preukschas
|
fb0279f311
|
Fix vote counting to only count main target notes (not mixed in ones)
|
2012-10-10 12:09:45 +02:00 |
|
|
Riyad Preukschas
|
3f72af9994
|
Make notes for merge requests include commit notes and add helpers
|
2012-10-10 12:06:30 +02:00 |
|
|
Riyad Preukschas
|
eb92813757
|
Move emoji auto-complete helper to ApplicationHelper
|
2012-10-10 00:53:42 +02:00 |
|
|
randx
|
679d0d6d76
|
Context refactoring. Move Issues list, Search logic to context
|
2012-10-09 22:09:46 +03:00 |
|
|
Riyad Preukschas
|
bbd92e57cb
|
Add emoji_for_completion helper
|
2012-10-09 14:47:42 +02:00 |
|
|
Andrey Kumanyaev
|
df7c52489a
|
simple refactoring
|
2012-10-09 04:10:04 +04:00 |
|
|
Robert Speicher
|
388d72e6bf
|
Add render_tree helper; simplify (speed up) tree_icon
|
2012-10-03 19:39:27 -04:00 |
|
|
Dmitriy Zaporozhets
|
69751aac32
|
Refactoring event views
|
2012-10-01 16:58:13 +03:00 |
|
|
Dmitriy Zaporozhets
|
663dd6fad6
|
Refactored events output. Added links to authors of events
|
2012-10-01 16:39:19 +03:00 |
|
|
Robert Speicher
|
1502be325d
|
Minor doc fix
|
2012-09-27 13:12:11 -04:00 |
|
|
Dmitriy Zaporozhets
|
2c8d3c33ff
|
Fixed ref switcher
|
2012-09-27 09:53:42 +03:00 |
|
|
Robert Speicher
|
36f68140d1
|
Replace various "active tab" checks with nav_link
Also remove now-unused tab_class helper
|
2012-09-26 16:38:28 -04:00 |
|
|
Robert Speicher
|
f064c84019
|
Add nav_link helper to TabHelper
|
2012-09-26 16:32:26 -04:00 |
|
|
Robert Speicher
|
aa0c4b77b6
|
Add current_action? helper
|
2012-09-26 16:32:26 -04:00 |
|
|
Robert Speicher
|
b62d6a1fe2
|
Remove commit_tab_class helper
|
2012-09-26 16:32:25 -04:00 |
|
|
Robert Speicher
|
51c1e49900
|
Change active tab and nav class to "active"
The main nav used active, the sub nav used current. This normalizes it.
|
2012-09-26 16:32:24 -04:00 |
|
|
Robert Speicher
|
adcc6a0b0e
|
Move tab_class helper to TabHelper
|
2012-09-26 16:32:24 -04:00 |
|
|
Robert Speicher
|
60ac6a28a2
|
Allow current_controller? helper to take an Array of options
|
2012-09-26 16:32:24 -04:00 |
|
|
Robert Speicher
|
3ad931ca92
|
Add current_controller? helper method
Simplifies some of the "active tab" checks we're doing
|
2012-09-26 16:32:23 -04:00 |
|
|
Robert Speicher
|
79a02df92e
|
Update usages of tree_file_project_ref_path to project_tree_path
|
2012-09-26 16:32:21 -04:00 |
|
|
Dmitriy Zaporozhets
|
0e524aaea1
|
Added workaround for github-markup issue with rendering markdown
|
2012-09-20 13:00:18 +03:00 |
|