deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4772 commits 6 branches 43 tags 25 MiB
Commit graph

1636 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
9152ab7955 Fix missing image for last push 2013-01-10 20:20:56 +02:00
Dmitriy Zaporozhets
e25656d09b Improve wiki typography 2013-01-10 18:09:12 +02:00
Dmitriy Zaporozhets
dd20da1bff Fix pager loading on every page in application 2013-01-10 17:38:37 +02:00
Dmitriy Zaporozhets
c2982c9a31 sidekiq.log in admin area. Improved admin dashboard 2013-01-10 08:43:25 +02:00
AlexDenisov
0d9f73fa1e JavaScript removed from dashboard#index template. 2013-01-09 19:30:20 +00:00
Alex Denisov
97d17cf835 Event filters stores at cookies. 2013-01-09 19:30:20 +00:00
Dmitriy Zaporozhets
c7bb3a1f72 sidekiq 2013-01-09 08:14:05 +03:00
Dmitriy Zaporozhets
31e3dc600a Fix routing specs 2013-01-09 09:47:25 +02:00
Dmitriy Zaporozhets
80e79f33af Merge pull request #2516 from jouve/fix_json_exemples_in_help 
fix exemple js data in help/web_hook
 2013-01-08 23:43:43 -08:00
Cyril
0a0d2ecf85 fix exemple js data in help/web_hook 2013-01-08 15:34:15 +01:00
Dmitriy Zaporozhets
b6568db1bc Fix minor style issue for compare 2013-01-08 12:23:33 +02:00
Dmitriy Zaporozhets
f9528bfb86 a bit of restyling for issues and merge request lists 2013-01-08 08:14:05 +03: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
fb470e8e2a Validate username uniq in scope of namespace 2013-01-07 17:36:24 +02:00
Dmitriy Zaporozhets
8d8c161a7f Speedup dashboard via loading events with ajax 2013-01-07 14:36:01 +02:00
Dmitriy Zaporozhets
6c777ff823 Improve milestone show page 2013-01-07 14:08:03 +02:00
Dmitriy Zaporozhets
676a9a7e28 Fix xss vulnerability 2013-01-07 11:32:12 +02:00
Dmitriy Zaporozhets
1665a06fdd Added cleanup to help rake 2013-01-06 00:30:38 +02:00
Dmitriy Zaporozhets
68eb394824 Green button when we create new item, blue when save or some primary action 2013-01-06 00:08:02 +02:00
Dmitriy Zaporozhets
eded4bfa95 Raise exception and show message to user if repo missing satellite 2013-01-05 23:09:26 +02:00
Dmitriy Zaporozhets
eaa8cd28d0 Merge branch 'mergerequest-to-coffee' of https://github.com/koenpunt/gitlabhq into koenpunt-mergerequest-to-coffee 2013-01-05 22:54:48 +02:00
Dmitriy Zaporozhets
f33ada855c Merge pull request #2226 from jouve/username 
add username to team_member page
 2013-01-05 12:33:39 -08:00
Dmitriy Zaporozhets
1724f45f46 Remove unused styles. Restyled Issues a bit 2013-01-05 14:49:08 +02:00
Dmitriy Zaporozhets
5a214ee6f1 Remove unused methods 2013-01-05 13:11:15 +02:00
Dmitriy Zaporozhets
e3d7ce2cc4 Tests are fixed now 2013-01-05 12:12:02 +02:00
Koen Punt
a1566a9c86 Converted merge_requests.js to coffeescript and updated code 2013-01-05 02:53:34 +01:00
Dmitriy Zaporozhets
e16cebac3e Fixed styles, ProjectHook specs etc 2013-01-05 00:35:38 +02:00
Dmitriy Zaporozhets
c6298678f5 use ui-box as for all 2013-01-04 23:35:31 +02:00
Dmitriy Zaporozhets
14d0ef8f37 Show images preview in notes. Show line additions/deletions for commit 2013-01-04 22:13:32 +02:00
Dmitriy Zaporozhets
ef5b36eaaf Fixed protected branches and file edit 2013-01-04 21:45:30 +02:00
Dmitriy Zaporozhets
afbdbb0c95 Rspec fixes 2013-01-04 18:50:31 +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
Riyad Preukschas
e29687552e Fix link titles 2013-01-02 21:07:02 +01:00
Dmitriy Zaporozhets
07a5cb2ef8 More readable Title for tab 2013-01-02 21:52:03 +02:00
Riyad Preukschas
7335f366dc Fix comment and reply buttons 2013-01-02 20:49:27 +01:00
Dmitriy Zaporozhets
642e64034c Fix crash on group => show 2013-01-02 20:59:47 +02:00
Dmitriy Zaporozhets
ce484fa9da Fixed admin -> group -> show 2013-01-02 20:45:11 +02:00
Dmitriy Zaporozhets
d431e43392 Fix few bugs and tests after refactoring ownership logic 2013-01-02 19:32:34 +02:00
Dmitriy Zaporozhets
00a1f5bc2c Project has now correct owner and creator. Increased test coverage 2013-01-02 19:00:00 +02:00
Dmitriy Zaporozhets
91995909d9 Fix #2375. Admin and owner can manage groups 2013-01-02 18:57:02 +02:00
Dmitriy Zaporozhets
ffe064a2c1 Bit of cleanup and improving mailer 2012-12-31 19:46:40 +02:00
Dmitriy Zaporozhets
cf3f22cc99 Corrent link for MR diff note in email 2012-12-31 19:06:49 +02:00
Dmitriy Zaporozhets
22ec3fa14c Fix MR css for accept MR block 2012-12-31 18:35:38 +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
e37a043df7 Get rid of skipping callbacks in production code. Dont trigger gitolite more than once on import in group 2012-12-30 13:37:33 +02:00
Robert Hopson
32be082055 Update app/views/notify/new_merge_request_email.html.haml 
Fix spelling of 'assignee'
 2012-12-28 10:56:48 -08:00
Dmitriy Zaporozhets
3de4271846 Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298 2012-12-28 09:14:28 +02:00
Dmitriy Zaporozhets
4cbb29cfad Fix not_in_project scope. Added counters in admin -> users. Improved seeds 2012-12-27 06:14:05 +03:00
Andrey Kumanyaev
c8bf5905bf Fix form url and routes path 2012-12-26 20:31:18 +04:00
Andrey Kumanyaev
39e7a0eafe Rewrite rendering rows with users projects access in Users table in Admin group section 2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
634783feb0 Rename scope "in_group" to "in_namespace" 2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
1e3d238910 Replace short loop variable from "p" to "project" 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
2753cea75a Add variable form in user section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
25c5763780 Add functional in user section 2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
9c574464a6 Add functional in admin section 2012-12-26 19:52:15 +04:00
Dmitriy Zaporozhets
c8ba5c2d58 Fix routing issues when navigating over tree, commits etc 2012-12-25 06:14:05 +03:00
Dmitriy Zaporozhets
6570843f84 Fix MR count for group scope 2012-12-24 21:27:12 +02:00
Dmitriy Zaporozhets
4ba24596d3 Make the logo icon more awesome 2012-12-24 21:18:23 +02:00
Dmitriy Zaporozhets
2937f35f9a Replace Wire font with Yanone. Show only icon as link to dashboard 2012-12-24 14:24:45 +02: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
Dmitriy Zaporozhets
25c33ca3d0 Fix webhook data sample 2012-12-23 01:14:04 +02:00
Dmitriy Zaporozhets
3ff131a747 Improve web hook data. Use clonable url in repo info 2012-12-23 01:10:57 +02:00
Dmitriy Zaporozhets
86ed2e8f17 Fixed MR count on dashboard 2012-12-23 00:39:42 +02:00
Riyad Preukschas
eaa99478a7 Up API version to v3 2012-12-21 18:55:39 +01:00
Dmitriy Zaporozhets
a47032bc29 Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509 
Conflicts:
	vendor/assets/javascripts/branch-graph.js
 2012-12-21 13:07:34 +02:00
Riyad Preukschas
0efc903eef Fix text in project move mail 2012-12-20 22:25:42 +01:00
Dmitriy Zaporozhets
2a3f5dae0f Fix email send on close/reopen issue. Display project name with namespace. remove css style 2012-12-20 23:04:27 +02:00
Dmitriy Zaporozhets
75dd704294 Send update instructions after project namespace id changed or namespace path changed 2012-12-20 22:16:51 +02:00
Dmitriy Zaporozhets
d188adfd97 Changelog updated. Added warnings to username form 2012-12-20 21:16:42 +02: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
b772c2c3f0 Fix issue update.js 2012-12-20 16:42:13 +02:00
Dmitriy Zaporozhets
a7aee9d1ee Pretty compare mode 2012-12-19 20:14:05 +03:00
Dmitriy Zaporozhets
40c6d87175 Merge pull request #2315 from koenpunt/gh-issue-513 
Added compare switch
 2012-12-20 06:15:39 -08:00
Koen Punt
d11f9a632c only show switch if from and to are set 2012-12-20 14:42:05 +01:00
Koen Punt
9916e8d6dc Updated test to match with switched commits 
Added compare switch
 2012-12-20 14:39:39 +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
adb17d6052 Cleanup after issues refactor and fix test 2012-12-20 15:39:54 +02:00
Dmitriy Zaporozhets
2f7effe804 Refactor issues, Remove ajax 2012-12-19 06:14:05 +03:00
Dmitriy Zaporozhets
8826077471 Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets
85d5f606f6 Labels autocomplete 2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets
2b921a6c72 Few icons for services list 2012-12-20 11:52:42 +02:00
Dmitriy Zaporozhets
9ada678819 Split commit_id and noteable_id for Note 2012-12-18 20:02:00 +02:00
Dmitriy Zaporozhets
f4a6f1fd5a Fix admin paging gap issue 2012-12-17 15:57:10 +02:00
Dmitriy Zaporozhets
5058c4fdcf Fix wall notes event trying to render target 2012-12-16 19:52:39 +02:00
Dmitriy Zaporozhets
26afde94fd Merge pull request #2250 from jouve/fix_missing_tr_in_thead 
add missing mandatory tr in thead
 2012-12-16 08:16:42 -08:00
Dmitriy Zaporozhets
0f7d3f591c Moving repositories spec to roles. Added missing spec for project 2012-12-15 12:32:09 +02:00
Dmitriy Zaporozhets
0ff468160e Fixed event.allowed? with event.proper? 2012-12-14 21:54:49 +02:00
Dmitriy Zaporozhets
f2db188dbe Processing with note events. reformated dashboard for more events to handle 2012-12-14 21:39:55 +02:00
Dmitriy Zaporozhets
678e5355a3 Create events on comments and milestone 2012-12-14 19:33:33 +02:00
Dmitriy Zaporozhets
190e483fb4 Rework of milestones 2012-12-14 08:34:05 +03:00
Dmitriy Zaporozhets
b01f8b63c2 added NamespacedProject role. Extended project info displayed for admin. Fixed project limit 2012-12-14 08:14:05 +03:00
Dmitriy Zaporozhets
44209861e8 Allow group path renaming. Dont show project transfer if no permissions. More danger messages :) 2012-12-14 06:14:05 +03:00
Dmitriy Zaporozhets
a8fbda945e bit reordering and cleanup unused styles 2012-12-13 21:44:55 +02:00
Dmitriy Zaporozhets
1d156c9c8e Fix project lookup. Show error if project transfer fails 2012-12-13 19:20:37 +02: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
bca7bddd3d Add ace editor to snippets 2012-12-12 19:42:08 +02:00
Dmitriy Zaporozhets
273c0d2aa3 Merge pull request #2253 from alexleutgoeb/patch-1 
Minor: Change html input type to "email" on sign-in view
 2012-12-12 04:17:14 -08:00
Dmitriy Zaporozhets
439d03bbed Fix namespace api autocomplete 2012-12-12 12:54:28 +02:00
Dmitriy Zaporozhets
d7eb314553 Project titles with namespaces 2012-12-12 12:02:29 +02:00
Alex Leutgöb
f2bf05066d Add autofocus attribute to sign-in email field 2012-12-11 11:57:25 +01:00
Alex Leutgöb
8738eb2369 Change html input type to "email" on sign-in view 
As long as the username is the user's email address it makes sense to use input="email" helper for the email field. This allows HTML5 capable (mobile) devices to bring up an email input keyboard instead of the default one.
 2012-12-11 11:25:55 +01:00
Dmitriy Zaporozhets
5d219bd5f0 Fix gitolite error instructions 2012-12-11 09:22:14 +02:00
Dmitriy Zaporozhets
ca936d2784 Improve CI integration for merge requests 2012-12-11 06:14:05 +03:00
Cyril
c76764b7dc add missing mandatory tr in thead 2012-12-11 02:39:05 +01:00
Cyril
7d3ee2baa6 add username to team_member page 2012-12-11 02:17:09 +01:00
Dmitriy Zaporozhets
b1437d4c8d use link_to_project for Dashboard: Issues, MR 2012-12-10 15:39:10 +02:00
Dmitriy Zaporozhets
bf13579b92 Make admin sorting more obvious 2012-12-10 06:14:05 +03:00
Dmitriy Zaporozhets
f1dfc27c5d Replace project with namespace for events 2012-12-09 16:03:24 +02:00
Dmitriy Zaporozhets
f4d9059b7e Show project with namespace in feeds 2012-12-09 10:56:15 +02:00
Koen Punt
4b2ecbc420 Updated branch-graph, abstracted some code in seperate functions 
Removed unused Raphael.fn.popup
 2012-12-07 22:05:17 +01:00
Koen Punt
e1282d507f BranchGraph now loads async 
Centralized keyboard and drag events for BranchGraph
 2012-12-07 19:06:46 +01:00
Koen Punt
40576b8709 Fixed #1509 by converting the entities in js 
Converted BranchGraph to some sort of Class
 2012-12-07 17:39:40 +01:00
Dmitriy Zaporozhets
84465576d7 Dont show remove project button if you have no permission 2012-12-07 15:53:04 +02: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
Dmitriy Zaporozhets
cc0295b789 Only owner can remove project 2012-12-05 06:14:05 +03:00
Riyad Preukschas
b47173da6a Revamped note form options. 2012-12-03 22:51:57 +01:00
Riyad Preukschas
4ed8278870 Fix a bunch of smaller glitches. 2012-12-03 22:51:57 +01:00
Riyad Preukschas
7978f8dd2b Fix handling form errors. 2012-12-03 22:51:57 +01:00
Riyad Preukschas
c1ffee4e65 Fix dicussion headers 2012-12-03 22:51:57 +01:00
Riyad Preukschas
c20af32ae4 Pull together and rename Notes partials 2012-12-03 22:51:57 +01:00
Riyad Preukschas
6fc10fa256 Unify forms for discussions and main target. 
Allows previews and uploads in all forms.
Also fixes #1730
 2012-12-03 22:51:56 +01:00
Riyad Preukschas
fbd345ea20 Make attachments more obvious 2012-12-03 22:51:56 +01:00
Riyad Preukschas
c4a7824a8c Fix wall notes 2012-12-03 22:51:56 +01:00
Riyad Preukschas
140652e9b0 Fix common form and note preview 2012-12-03 22:51:56 +01:00
Riyad Preukschas
918dc87376 Move code for appending a discussion note to notes JS 2012-12-03 22:51:56 +01:00
Riyad Preukschas
494ae87840 Refactor discussion reply 2012-12-03 22:51:56 +01:00
Riyad Preukschas
06ea122840 Refactor diff notes creation 2012-12-03 22:51:56 +01:00
Riyad Preukschas
39834ec640 Move diff notes into the actual diff content column 2012-12-03 22:51:56 +01:00
Riyad Preukschas
4d2278e7c6 Rename commits/text_file partial to text_diff 2012-12-03 22:51:56 +01:00
Riyad Preukschas
6d5c29dc2b Inline diff_notes_reply_button partial 2012-12-03 22:51:56 +01:00
Riyad Preukschas
3bc507e5c5 Rename diff note partials 2012-12-03 22:51:56 +01:00
Riyad Preukschas
bd60a4ed40 Make notes JS know which notes are new in a request 2012-12-03 22:51:56 +01:00
Riyad Preukschas
ae067ee322 Fix vote counting 2012-12-03 22:51:56 +01:00
Riyad Preukschas
6c6f415cae Fix appending diff line notes 2012-12-03 22:51:55 +01:00
Riyad Preukschas
5c2f6d7f05 Update notes views to support discussions 2012-12-03 22:51:55 +01:00
Riyad Preukschas
7971383d53 Rename the "Comments" tab for merge requests "Discussion" 2012-12-03 22:51:55 +01:00
Riyad Preukschas
9b919939a3 Fix parameter passing and wording for per line notes 2012-12-03 22:51:55 +01:00
Johannes Schleifenbaum
fddc0c29aa add help page for gitlab specific rake tasks 2012-12-03 17:19:33 +01:00
Dmitriy Zaporozhets
6ea6ab7c8d Restyled services page in order to make it more usable 2012-12-02 08:41:06 +03:00
Dmitriy Zaporozhets
e376f31507 Admin can move project to ANY namespace. Updated permissions page 2012-12-04 22:48:24 +02:00
Dmitriy Zaporozhets
2a1c5cdf99 Only owner of current namespace can change project namespace 2012-12-04 22:06:55 +02:00
Dmitriy Zaporozhets
9acd7cf1bd Show namespaces when adding projects to user in admin area 2012-12-04 15:26:12 +02:00
Dmitriy Zaporozhets
d8398921eb Dont allow select block user as new team member 2012-12-04 15:22:22 +02:00
Dmitriy Zaporozhets
ba74fa1413 Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner. 2012-12-03 21:14:05 +03:00
Dmitriy Zaporozhets
7f6bbf06f8 Fix bug getting started message when navigate to personal projects w/o them exist 2012-12-04 11:18:41 +02:00
Dmitriy Zaporozhets
f2a76228f2 Remove unsued css styles. Fixed Milestone preselected date. 2012-12-01 09:14:05 +03:00
Dmitriy Zaporozhets
2d076394aa Fix github issue #967 2012-12-03 13:22:28 +02:00
Dmitriy Zaporozhets
0530e5baae Add description to project features on edit project page 2012-12-02 19:28:23 +02:00
Dmitriy Zaporozhets
46bf3a0949 Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00
Dmitriy Zaporozhets
f2e1c8b709 Merge pull request #2138 from jouve/refactor_flash 
refactor flash
 2012-12-02 02:18:34 -08:00
Johannes Schleifenbaum
0323610b72 commit diff - check if prev_commit is not nil 2012-12-01 19:31:39 +01:00
Cyril
a9a5497915 refactor flash 
* make unobtrusive js
* convert js to coffee
 2012-12-01 18:40:47 +01:00
Dmitriy Zaporozhets
eb3e07a509 Use project owner if no namespace. Restyled team page 2012-11-30 18:26:17 +02:00
Dmitriy Zaporozhets
c38b9a2f80 Filter projects on dashboard 2012-11-30 13:40:34 +02:00
Nihad Abbasov
eb061b9b06 fix label name 2012-11-29 14:26:18 -08:00
Nihad Abbasov
658f260e98 add docs for notes API 2012-11-29 12:32:05 -08:00
Dmitriy Zaporozhets
aaa1c94239 Manage team from groups page. Phase 1 2012-11-29 20:14:05 +03:00
Dmitriy Zaporozhets
08fded3fac Minor improvments to UI 2012-11-29 18:09:27 +02:00
Dmitriy Zaporozhets
ff9a2e2a93 Improve admin logs 2012-11-29 07:49:11 +03:00
Dmitriy Zaporozhets
eb1004f789 Refactor abilities. Added ProjectUpdate context. Fixed few bugs with namespaces 2012-11-29 12:39:03 +02:00
Dmitriy Zaporozhets
cf8b3692cd Merge pull request #2105 from jouve/improve_admin_views 
Improve admin section
 2012-11-29 00:39:50 -08:00
Dmitriy Zaporozhets
a0aa0212a9 Removed feature: comments on wiki 2012-11-29 06:14:05 +03:00
Alex Denisov
34c2d8e82e authorized_for scope added to project 2012-11-28 20:09:13 +02:00
Dmitriy Zaporozhets
c873cf81f6 Restyled error messages in common way. Added title to head partial 2012-11-28 19:40:54 +02:00
Cyril
e0a9ffcdaa Improve admin views for project and groups 
* layout: add 'Groups' item to main_menu
* admin/dashboard: add a ui-box for groups
* projects and groups: remove nav tabs
 2012-11-28 18:04:28 +01:00
Robert Speicher
4db362f519 Add a link to each project on the Issues dashboard 2012-11-28 11:00:02 -05:00
Dmitriy Zaporozhets
f614ae8ef7 Increased test coverage 2012-11-21 07:14:05 +03:00
Dmitriy Zaporozhets
47234ab367 Validate username. Gitlab::Regex added 2012-11-28 06:14:05 +03:00
Riyad Preukschas
184a9ecaf6 Add user_color_scheme_class helper 2012-11-27 22:51:05 +01: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
70bf7f6e19 Project -> update repo only on create and destroy. Fixtures Updated with namespaces. Fixed moving repo 2012-11-21 08:54:05 +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
899afd0067 Fix snippet render issue cause of haml preserve 2012-11-26 07:14:05 +03:00
Dmitriy Zaporozhets
29636d4dab Fix snippet render error 2012-11-26 06:14:05 +03:00
Dmitriy Zaporozhets
e750efd9fc Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests 
Diff and patch for commits and merge requests
 2012-11-26 04:40:49 -08:00
Dmitriy Zaporozhets
1d857aae17 project admin area - show project name with namespace 2012-11-25 18:52:12 +02:00
Dmitriy Zaporozhets
c31d48dd25 Allow project creation in scope of group for non-admin but group owners 2012-11-25 11:57:01 +02:00
Riyad Preukschas
79a4ed15ce Change "Get Patch" buttons to dropdowns orffering patches and diffs 2012-11-25 00:36:19 +01:00
Riyad Preukschas
2b1afa0e62 Remove merge_request#raw and replace it with formats to #show 
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
 2012-11-25 00:05:44 +01:00
Dmitriy Zaporozhets
2f22874ba6 Fix group assoc. Show namespace in project list 2012-11-24 22:39:51 +02:00
Dmitriy Zaporozhets
f37fa968b2 add ability to change namespace from project edit page 2012-11-24 22:00:30 +02:00
Dmitriy Zaporozhets
9304d049de Fixed some tests and snippet colorize 2012-11-23 22:31:09 +03:00
Dmitriy Zaporozhets
470aa7675e Fix project.code-related functionality 2012-11-23 21:31:09 +03:00
Dmitriy Zaporozhets
c50ec72b52 Deprecate code for Project. Use title and path 2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets
ab9d023651 Create dir with namespace. Create namespace with user 2012-11-23 09:11:09 +03:00
Dmitriy Zaporozhets
f17ddeb394 Make admin project list more useful 2012-11-23 07:24:09 +03:00
Dmitriy Zaporozhets
552b3105fb Fixed admin area. Create project only from one place 2012-11-23 07:31:09 +03:00
Dmitriy Zaporozhets
2b683b0d0b Ability to create project with namespace 2012-11-23 07:11:09 +03:00
Riyad Preukschas
6ddf4567f4 Don't escape Html in patches 
Fixes #2036
 2012-11-22 12:45:39 +01:00
Dmitriy Zaporozhets
9e8aadb0f0 Merge pull request #2026 from koenpunt/extended-image-diff 
Added bg for transparent images
 2012-11-21 12:56:06 -08:00
Dmitriy Zaporozhets
7392d28dca Merge pull request #2030 from tsigo/theme_feedback 
Improve user feedback on the Profile > Design page
 2012-11-21 12:54:22 -08:00
Robert Speicher
30a66c065a Improve user feedback on the Profile > Design page 
- Header changes immediately without a page reload
- Lets the user know that we actually saved their setting when changed
 2012-11-21 15:01:40 -05:00
Riyad Preukschas
d7ce2c5c07 Fix rendering template for invalid notes 2012-11-21 20:26:37 +01:00
Riyad Preukschas
3e800c3bb1 Refactor GFM JS naming and access 2012-11-21 20:25:49 +01:00
Riyad Preukschas
1cda62465f Fix GFM JS code style 2012-11-21 20:05:37 +01:00
Koen Punt
1de0ea28b9 added bg for transparent images 
added width and height below images in diff
 2012-11-21 18:27:21 +01:00
Dmitriy Zaporozhets
4c6c24856c Themes refactored 2012-11-21 18:19:03 +02:00
Dmitriy Zaporozhets
9477448ac0 Merge pull request #2023 from martinsp/master 
fixes :notice after project is created in projects_controller
 2012-11-21 06:25:16 -08:00
Martins Polakovs
8c5b79a923 Fixes :notice after project is created 
When projects were created in projects_controller
create.js.haml passed notice as url parameter and
therefore notice was not displayed in the page after
redirect to the project page
 2012-11-21 14:30:35 +02:00
Dmitriy Zaporozhets
898d09a21e Gitlab_meta to 3.1. Added workaround for 500 Redis error until it will be fixed 2012-11-21 12:45:15 +02:00
Dmitriy Zaporozhets
0046409970 I prefer icons on header 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets
6bf656970d Use fieldset. Improved profile 2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets
d18e2bd59d styled error message 2012-11-21 06:14:05 +03:00
Dmitriy Zaporozhets
942c410119 Implemented bootstrap 2.2.1.1. Restyled header panel 2012-11-20 23:05:15 +02:00
Dmitriy Zaporozhets
ebcbe0c87b Add status badge for MR 2012-11-20 20:34:05 +03:00
Dmitriy Zaporozhets
9f65c274ef Fix ci service creation logic 2012-11-20 14:16:04 +02:00
Dmitriy Zaporozhets
406a0c809b GitLabCi Service imtegration 2012-11-19 22:34:05 +03:00
Dmitriy Zaporozhets
95c23b2f97 Annotated. schema updated 2012-11-19 21:24:05 +03:00
Dmitriy Zaporozhets
86b181398c Merge pull request #2011 from koenpunt/extended-image-diff 
Optimized commit diff views, now showing file size and file mode changes
 2012-11-19 04:01:49 -08:00
Vanja Radovanović
333f7372c5 fix: grouping by date desc doesn't sort it too 2012-11-19 11:44:28 +01: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
Riyad Preukschas
98e938bdb0 Fix editor form, styles and JS 2012-11-17 15:43:13 +01:00
Riyad Preukschas
7caf4de2cf Fix setting Ace mode 2012-11-17 15:28:32 +01:00
Riyad Preukschas
6c1b44859d Fix Haml indenting file content 2012-11-17 01:00:26 +01:00
Dmitriy Zaporozhets
b339c747a9 Merge pull request #1937 from riyad/add-file-line-links 
Add file line links
 2012-11-16 03:46:43 -08:00
Dmitriy Zaporozhets
f0a6fbaae3 Improve Commits stats code 2012-11-13 21:26:57 +02:00
Dmitriy Zaporozhets
9d499b86f8 Fix loader hiding when create new project 2012-11-13 12:36:41 +02:00
Dmitriy Zaporozhets
3c7806c3f2 Improve lists. Remove unneccessary padding 2012-11-11 00:08:42 +02:00
randx
3e04673334 Added feature test for stats 2012-11-10 23:33:10 +02:00
randx
1c5b2a5153 Stats page 2012-11-10 23:08:47 +02:00
Riyad Preukschas
c42ada9bee Allow linking to file lines 
Supported formats: "L12" for single lines and "L12-34" for multiple lines
 2012-11-10 00:03:46 +01:00
jdamick
12c0408ef5 Update app/views/notify/project_access_granted_email.html.haml 
changing wording to sound more better.
 2012-11-09 11:03:42 -05:00
Saito
f1ac2a616b remove encode lib, clean all encoded area. 2012-11-09 01:41:07 +08:00
Dmitriy Zaporozhets
784cb886cf Sign in screen: removed hr, added clearfix 2012-11-07 17:49:52 +02:00
Dmitriy Zaporozhets
b7445bb006 Fix github issue #1946 2012-11-07 17:15:41 +02:00
Dmitriy Zaporozhets
8114d36caf Merge pull request #1720 from coagulant/wiki_search 
Wiki search
 2012-11-07 03:51:20 -08:00
Riyad Preukschas
10d881c9ca Line anchors for file view 2012-11-07 13:31:26 +02: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
Dmitriy Zaporozhets
f8e27b92bf Merge pull request #1902 from tsigo/breadcrumbs 
Fix breadcrumb links on Commits page
 2012-11-02 03:46:27 -07:00
Riyad Preukschas
48de0ba867 Fix source for iframe on Resque admin page 2012-11-01 23:34:16 +01: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
Dmitriy Zaporozhets
404040d7ae Fix invalid template path for huge commit 2012-10-30 13:35:57 +02:00
randx
36dbac2fd9 More seeds 2012-10-30 10:03:21 +02:00
randx
e4cf99db46 Refactor milestones related functionality. Added seeds for Milestine and MR 2012-10-30 09:22:24 +02:00
Valeriy Sizov
53a3be03fc Update app/views/profile/account.html.haml 
TYPO #1870
 2012-10-30 00:32:32 +02:00
Valeriy Sizov
9d56c7f657 Update app/views/shared/_no_ssh.html.haml 
TYPO
 2012-10-30 00:29:13 +02:00
randx
a8398e5124 Fix merge request count for milestone index 2012-10-29 23:50:35 +02:00
randx
e705344daa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-10-29 23:46:46 +02:00
randx
f417a265d7 Finalize milestones for Merge Requests 2012-10-29 23:45:11 +02:00
Riyad Preukschas
0a9adbbe4a Fix no SSH key warning 2012-10-29 21:51:28 +01:00
randx
d4e070cfad Improve styles. Add merge request completness to milestone percentage 2012-10-29 22:40:00 +02:00
randx
ecdf778e80 Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr 
Conflicts:
	app/views/merge_requests/_form.html.haml
 2012-10-29 21:37:46 +02:00
Sergio Visinoni
263282dec9 Show Milestone information in MR Listing 
When a MR belongs to a Milestone, show this information in the listing
with a small box telling the Milestone title.
 2012-10-28 09:31:52 +01:00
Riyad Preukschas
3d0197246e Use #author_link for blame, commits and tree 2012-10-27 18:27:47 +02:00
Riyad Preukschas
17cec05087 Make new/edit issue forms use containers on the page instead of adding their own 
Fixes #1830
 2012-10-27 17:54:24 +02:00
randx
3c5a3fe0ae Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end 
Conflicts:
	app/views/issues/_form.html.haml
 2012-10-27 11:24:11 +03:00
randx
72f984e3d3 Prevent grit from caching graph commits 2012-10-26 21:52:26 +03:00
Dmitriy Zaporozhets
1c9351abf0 Restyle branches list. Remove unneccesary styles from tree avatar 2012-10-26 19:00:09 +03:00
Dmitriy Zaporozhets
b4708d006c Restyled git tags page. Added truncated tags message 2012-10-26 18:37:12 +03:00
Sergio Visinoni
e51c37bdbd Display Merge Requests <-> Milestone relations 
Show the relation between Merge Requests and Mileston in different
places:
- Merge Request page
- Milestone list page
- Milestone details page
 2012-10-26 16:12:40 +02:00
Sergio Visinoni
a7d0816933 Add Milestone information in Merge Requests 
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
  Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
  Merge Requests listing page
 2012-10-26 16:12:40 +02:00
Riyad Preukschas
0447ab375a Extract shared/clone_panel partial 2012-10-25 23:39:02 +02:00
Riyad Preukschas
ff396e0a7e Extract search field into a partial 2012-10-25 23:39:02 +02:00
hardchor
b5ced56ba4 Some grammatical improvements 
Nothing too dramatic, just some improvements.
 2012-10-25 22:11:06 +02:00
Dmitriy Zaporozhets
11452c903f Fix 500 error on tree view woth submodule 2012-10-25 12:30:09 +03:00
Dmitriy Zaporozhets
6d0dcb6614 Reduce max commit diff size. Added Commit::DIFF_SAFE_SIZE 2012-10-25 12:16:14 +03:00
Valery Sizov
38175209c5 Merge branch 'feature/import_team_from_other_project' of dev.gitlabhq.com:gitlabhq 2012-10-24 12:56:47 +00:00
Dmitriy Zaporozhets
a7efeb3781 Fix chrome issues list 2012-10-24 15:25:28 +03:00
Dmitriy Zaporozhets
6f4576b743 Spinach feature 2012-10-24 15:23:04 +03:00
Dmitriy Zaporozhets
fd0aca1225 Feature implemented 2012-10-24 14:20:53 +03:00
Staicu Ionut
2d7062d8fc Added autofocus for issue title 2012-10-24 14:06:10 +03:00
Dmitriy Zaporozhets
b2df61d85a Fix 500 error on admin project if empty 2012-10-23 11:29:47 +03:00
randx
e51b2d58e7 Restyled last push widget. Increased line-height for td in tables 2012-10-22 23:37:50 +03:00
Marin Jankovski
d75cc7eafd Display https as repo clone indicator and prevent modification of web_protocol variable. 
Rewrite build_url, use web_protocol for repo indicator.

Explicitly initialize custom port to make the logic obvious.
 2012-10-21 15:48:34 +02:00
Dmitriy Zaporozhets
cd9f135a66 Merge pull request #1717 from riyad/add-author-to-tree-listing 
Update author info in tree listing
 2012-10-21 04:08:45 -07:00
randx
0189ee97ed Security for online editor. Replace dev_access?, master_access? with can? method usage 2012-10-21 12:12:14 +03:00
Nihad Abbasov
c28722689d merge graph.js into projects.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov
57c134c39a cleanup coffeescript code for mentions auto-complete 2012-10-19 03:41:10 -07:00
Nihad Abbasov
ec1bccb261 use 'js-' prefix for behavioral 'gfm-input' class 2012-10-19 03:41:10 -07:00
Riyad Preukschas
4fd73683d9 Update author info in tree view 2012-10-18 20:53:35 +02:00
Valeriy Sizov
8e989d4863 revert all wiki changes 2012-10-17 16:14:20 +03:00
Valeriy Sizov
607d8b7970 Wiki Style Fixing 2012-10-17 15:09:16 +03:00
Valeriy Sizov
372220d35b WebEditor: Cancel button. Confirm #1705 2012-10-17 00:27:47 +03:00
Valeriy Sizov
234eb7a8e4 WebEditor: rename button save -> commit #1705 2012-10-17 00:15:56 +03:00
Valeriy Sizov
ec05d9daf9 WebEditor: show branch #1705 2012-10-17 00:13:45 +03:00
Valeriy Sizov
d21443d1c6 Merge pull request #1713 from riyad/fix-issue-close-and-reopen-buttons 
Fix issue close and reopen button text and styles
 2012-10-16 14:05:53 -07:00
Valeriy Sizov
8ee8f36f6e WebEditor: fix unknown theme in production mode 2012-10-16 23:52:44 +03:00
Ilya Baryshev
e6524a919e Wiki search 
Very basic, using LIKE, and no search snippets.
 2012-10-16 23:05:11 +04:00
Riyad Preukschas
fa4c38f32b Fix issues close and reopen button text and styles 2012-10-16 19:17:48 +02:00
randx
76e1ca6430 tree.readme method added 2012-10-16 09:48:55 +03:00
randx
453b2ae68b Fix plain text readme 2012-10-16 09:43:22 +03:00
Dmitriy Zaporozhets
e8d6c3c1b6 Merge pull request #1706 from riyad/refactor-tree-views-and-improve-consistency 
Refactor tree views and improve consistency
 2012-10-15 23:33:49 -07:00
Riyad Preukschas
866b9f6d91 Make history link for trees look like action links for blobs 2012-10-16 00:57:15 +02:00
Riyad Preukschas
763022d698 Remove redundant branch labels from MR form 
Fixes #1525
 2012-10-16 00:46:48 +02:00
Riyad Preukschas
d40d2dd809 Fix offered links in tree/blob_actions partial 2012-10-15 23:42:08 +02:00
Riyad Preukschas
b80a019598 Use tree/blob_actions partial for blame view and fix file name encoding 2012-10-15 23:40:56 +02:00
Riyad Preukschas
3304262c3d Display more accurate file size in tree/blob/download partial 2012-10-15 23:40:21 +02:00
Riyad Preukschas
d96a807db7 Display file size instead of mode in tree/blob partial 2012-10-15 23:40:18 +02:00
Riyad Preukschas
d060856044 Extract out tree/blob/* partials 2012-10-15 23:40:06 +02:00
Riyad Preukschas
1f4d8eac24 Extract tree/readme partial 2012-10-15 23:40:02 +02:00
Riyad Preukschas
5cff72ad1e Extract tree/blob_actions partial 2012-10-15 23:39:49 +02:00
Riyad Preukschas
2f05ab1491 Rename tree/tree_file partial to tree/blob 2012-10-15 23:38:35 +02:00
Dmitriy Zaporozhets
e84d90c1e7 Merge pull request #1692 from riyad/saner-note-methods 
Small Note code cleanup
 2012-10-15 10:11:00 -07:00
randx
bd5dbe14e4 Merge branch 'web_editor' 2012-10-15 19:52:10 +03:00
randx
809aefb828 Minor improve to UI and code formatting of gitlab web editor 2012-10-15 19:51:11 +03:00
Riyad Preukschas
e26acd52b2 Fix link to wiki page in wiki comment notification 2012-10-14 17:12:38 +02:00
Riyad Preukschas
b1461de993 Make Note methods saner 2012-10-13 16:23:12 +02:00
Valeriy Sizov
2a78ae60eb WebEditor: commit message is required now 2012-10-12 20:07:24 +03:00
Valeriy Sizov
42bdfd021b WebEditor: base implementation 2012-10-12 20:07:24 +03:00
Valeriy Sizov
e53b47b447 WebEditor: sceleton 2012-10-12 20:07:24 +03:00
Dmitriy Zaporozhets
02c83f122a Design improved 2012-10-12 20:07:24 +03:00
Valeriy Sizov
57e2b5ed1a WebEditor: integrated editor 2012-10-12 20:07:24 +03:00
Valeriy Sizov
f6a8e69449 WebEditor: base form 2012-10-12 20:07:23 +03:00
Riyad Preukschas
19560a4b5f Fix displaying events for deleted things 2012-10-12 13:37:44 +02:00
Robert Speicher
7d145adf35 Move 'closed' attribute to the row instead of the cell 2012-10-10 13:06:34 -04:00
Robert Speicher
ce6e5f34d5 Remove unused li classes from milestone issue filter 2012-10-10 12:43:59 -04:00
Robert Speicher
ace816354f Add toggle to show closed issues on Milestones#show 
Progress on #1167
 2012-10-10 12:43:59 -04: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
Dmitriy Zaporozhets
dda852a0d5 Merge pull request #1629 from riyad/show-notes-indicator-for-commits-and-merge-requests 
Show numer of notes for commits and merge requests
 2012-10-10 01:45:39 -07:00
Dmitriy Zaporozhets
60b4c88e3a Merge pull request #1664 from riyad/auto-complete-everywhere 
Cleanup auto-completion and add it to all GFM inputs
 2012-10-10 01:45:03 -07:00
Riyad Preukschas
6dc8c0eac2 Make MRs also count and display its commits' notes 2012-10-10 01:31:36 +02:00
Riyad Preukschas
77bde9a0e4 Add notes count to commits in lists. 2012-10-10 01:31:36 +02:00
Riyad Preukschas
4d843d2ce1 Fix auto-completion for forms that are inserted with JS 2012-10-10 00:53:57 +02:00
Riyad Preukschas
e4aa5a5c8f Extract and split GFM auto-completion setup JS 
* static initialization and setup moved to assets
* per request initialization moved to layout partial
 2012-10-10 00:53:55 +02:00
Robert Speicher
cda5e66d7c Use History.js for better Tree browsing 
Closes #1578
 2012-10-09 18:38:59 -04:00
Riyad Preukschas
682f62fd4a Mark all GFM capable inputs 2012-10-09 23:06:33 +02:00
Riyad Preukschas
37e579ce10 Redo the auto-completion JS for notes 2012-10-09 14:48:35 +02:00
Riyad Preukschas
3adfbe3e81 Mark inputs for notes with GFM capabilities 2012-10-09 14:48:20 +02:00
randx
ce1b742b1e Group: new link on dashboard if admin. Fixed people count 2012-10-09 09:46:20 +03:00
Dmitriy Zaporozhets
26045d7a2c Merge pull request #1596 from riyad/fix-messages-for-deleted-things 
Fix messages for deleted things on dashboard
 2012-10-08 22:27:25 -07:00
Valeriy Sizov
a9cce9358a Merge pull request #1627 from tsigo/tree_performance 
Tree performance improvements
 2012-10-08 05:36:31 -07:00
Dmitriy Zaporozhets
624abdfc72 Merge branch 'feature/dashboardfeed' of https://github.com/alexleutgoeb/gitlabhq into alexleutgoeb-feature/dashboardfeed 
Conflicts:
	app/decorators/event_decorator.rb
 2012-10-08 13:52:07 +03:00
Dmitriy Zaporozhets
5501955d26 Merge pull request #1636 from dosire/consistent_issue_type_order 
Reversed order of progress indication so that the text matches the progress bar.
 2012-10-07 01:00:38 -07:00
Aaron Stone
7c2e67c660 Tiny fix to the add/edit groups form path field 2012-10-05 23:46:15 -07:00
joseph Borremans
82425cf358 reversed order of progress indication for visual harmony so that text matches the progress bar 2012-10-05 17:48:52 +02:00
Alex Leutgöb
987e351de7 Escape html entities in commit messages 2012-10-04 10:06:17 +02:00
Dmitriy Zaporozhets
d88332709c Fixed group issues/mr. Also speedup project list of admin area 2012-10-04 10:51:35 +03:00
Robert Speicher
388d72e6bf Add render_tree helper; simplify (speed up) tree_icon 2012-10-03 19:39:27 -04:00
Robert Speicher
a8fad4ff9c Remove locals from tree/submodule_item, use "object" instead 2012-10-03 19:39:27 -04:00
Robert Speicher
37c3474f68 Tree.init() JS is no longer required 2012-10-03 19:39:27 -04:00
Robert Speicher
96b4acf5e7 Remove locals from tree/tree_file and just use "object" instead 2012-10-03 19:39:27 -04:00
randx
4f7bd58307 Bigger fonts for groups box 2012-10-03 19:51:14 +03:00
Dmitriy Zaporozhets
f963d37408 Merge pull request #1592 from jouve/devise_layout 
make devise controllers use devise layout
 2012-10-03 07:06:08 -07:00
Valery Sizov
9e80d2d4f7 Merge branch 'feature/groups' of dev.gitlabhq.com:gitlabhq 2012-10-03 12:17:48 +00:00
Dmitriy Zaporozhets
8b76e30656 Spianch test for group dashboard 2012-10-03 13:42:17 +03:00
Dmitriy Zaporozhets
224fb5770c Added ability to manage groups from admin 2012-10-03 12:49:43 +03:00
Robert Speicher
38ca52f33b Use branches.length and tags.length instead of [whatever]_count 2012-10-02 18:56:57 -04:00
randx
010ac2b17f Added back link. cleanup group show page 2012-10-02 22:08:30 +03:00
randx
1b6a3dfec9 Move all stuff to groups controller 2012-10-02 20:42:15 +03:00
Dmitriy Zaporozhets
f9eda9b33a Group filtering on dashboard 2012-10-02 19:37:53 +03:00
Dmitriy Zaporozhets
d6363e9359 Admin Group scaffold -> new, show, index 2012-10-02 19:01:40 +03:00
Riyad Preukschas
93bc1ff108 Merge branch 'master' into fix-messages-for-deleted-things 2012-10-02 14:04:34 +02:00
Dmitriy Zaporozhets
b82cb2630c Use class instead id for css styles 2012-10-02 10:26:24 +03:00