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

1443 commits

Author SHA1 Message Date
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
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
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
Riyad Preukschas f5a62835bb Fix completion for per line forms 2012-09-30 12:07:45 +02:00
Riyad Preukschas 6135eeaa3e Don't link to removed ref 2012-09-30 00:53:21 +02:00
Cyril 236fd1e63b all devise controller use devise layout 2012-09-29 13:06:53 +02:00
Dmitriy Zaporozhets a79eb84289 commit show page styled a bit 2012-09-28 16:05:54 +03:00
Dmitriy Zaporozhets 68f4b59738 Merge pull request #1569 from jouve/simplify_controllers2 
Simplify controllers and layout handling
 2012-09-27 12:53:01 -07:00
Cyril be18397d82 rename ProjectController to ProjectResourceController 2012-09-27 20:59:42 +02:00
randx 308dfc36b8 Fix back button for tree navigation 2012-09-27 19:38:52 +03:00
randx afecb250a4 Dont show compare link if only one commit in push 2012-09-27 17:13:26 +03:00
Cyril e563e948bb Merge branch 'master' into simplify_controllers2 
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
 2012-09-27 12:25:52 +02:00
Dmitriy Zaporozhets a8870e87e4 Fix blame markup & breadcrubs for commits 2012-09-27 11:58:41 +03:00
Dmitriy Zaporozhets beb324c1c6 Fixed updir method. Fixed breadcrumbs for commits 2012-09-27 09:49:00 +03:00
Robert Speicher d8f7748dea Remove app_menu and project_menu partials 
Now it's consistent across layouts where their main menus are.
 2012-09-26 17:00:52 -04: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 275db3c522 Fix paths in commits/_head 2012-09-26 16:32:25 -04:00
Robert Speicher 0887dda8e4 Use current ref for Files and Commits if available 
Closes #1452
 2012-09-26 16:32:25 -04:00
Robert Speicher b62d6a1fe2 Remove commit_tab_class helper 2012-09-26 16:32:25 -04:00
Robert Speicher 86a7864dc7 Fix various links 2012-09-26 16:32:25 -04:00
Robert Speicher b462a13387 Compare views and cleanup 
- Remove compare/_head and just use commits/_head since they're identical
- Add index view; extract the form into a partial
 2012-09-26 16:32:24 -04:00
Robert Speicher 8fe63dab52 Use current_controller? in layouts/_head partial 2012-09-26 16:32:24 -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 545dc7e47d Fix atom feed links 2012-09-26 16:32:23 -04:00
Robert Speicher 1048917232 Update usages of project_commit[s] route helpers 2012-09-26 16:32:23 -04:00
Robert Speicher 99d391332f Add a "patch" MIME type, and render it like a normal view in Commit#show 2012-09-26 16:32:23 -04:00
Robert Speicher 3574826920 Use Commits#show instead of Commits#index 
Takes tree-ish + path as ID
 2012-09-26 16:32:22 -04:00
Robert Speicher 169f16fb32 Remove Commits#compare, add CompareController 2012-09-26 16:32:22 -04:00
Robert Speicher 398ba6f1bb DRY up Blame, Blob and Tree controllers 2012-09-26 16:32:22 -04:00
Robert Speicher 576cec6c67 Add BlobController, remove Refs#blob 2012-09-26 16:32:22 -04:00
Robert Speicher 39c6579306 Add BlameController, remove Refs#blame action 2012-09-26 16:32:22 -04:00
Robert Speicher 94af622c87 Move refs/blame view to blame/show 2012-09-26 16:32:21 -04:00
Robert Speicher 339dfa32b8 Fix ref_switcher path 2012-09-26 16:32:21 -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
Robert Speicher 6ddb35bd5e Move tree-related views from refs to trees 2012-09-26 16:32:21 -04:00
Robert Speicher b389247c02 Use Commit#show instead of Commits#show to view a single commit 
Commits#show (plural) is going to be for showing commit history on a
specific path.
 2012-09-26 16:32:21 -04:00
Cyril bdf317addc layout selected by controller name 2012-09-26 22:27:44 +02:00
randx 0261b0c64c Project activity inifinite scroll paging 2012-09-26 21:01:54 +03:00
Dmitriy Zaporozhets 9270b6c3c7 Fix milestone calendar, Removed unnecessary selects from admin 2012-09-26 16:49:20 +03:00
Nihad Abbasov 6df515a56d add auto-completion for +1, -1 emoji 2012-09-25 04:56:21 -07:00
Dmitriy Zaporozhets c3efcf7a62 Pollished push event 2012-09-25 13:15:06 +03:00
Alex Leutgöb 0b8e956f32 Add a more verbose dashboard event feed 
- Add project name to event title
- Push: Entry links to single commit or commits overview depending on number of pushed commits
- Push: Display first 15 commits with commit message and author and link to single commit
- Issues: Display issue description
 2012-09-24 15:12:44 +02:00
Dmitriy Zaporozhets 8ec956421c Merge pull request #1539 from NARKOZ/front-end 
auto-complete for mentions in notes
 2012-09-24 06:02:34 -07:00
Dmitriy Zaporozhets 6667f3dbf9 Colored labels for events 2012-09-24 13:33:51 +03:00
Dmitriy Zaporozhets d23022c6f6 Working on dashboard restyle and events refactoring 2012-09-24 12:32:51 +03:00
Nihad Abbasov 9c75fcbef1 auto complete team member mentions 2012-09-23 09:52:01 -07:00
Robert Speicher ad3eefdcb8 Minor grammar change 
[ci skip]
 2012-09-22 17:06:30 -04:00
Nihad Abbasov 4162566e11 separate project repositories API docs 2012-09-21 05:03:50 -07:00
Nihad Abbasov 1304331589 remove commits API section from help 2012-09-21 05:00:20 -07:00
Dmitriy Zaporozhets 10d3a30b25 APi for commits. Better api docs 2012-09-21 13:22:30 +03:00
Dmitriy Zaporozhets 4cc169d3ca Improve commits compare. Added tags to autocomplete. Dont look for commits if from & to are empty 2012-09-21 11:22:53 +03:00
Nihad Abbasov 81aeac46d6 update help section with session API docs 2012-09-20 08:51:26 -07:00
Dmitriy Zaporozhets 0e524aaea1 Added workaround for github-markup issue with rendering markdown 2012-09-20 13:00:18 +03:00
Robert Speicher ba72c6f683 Escape text passed directly to gfm 2012-09-19 20:21:12 -04:00
Robert Speicher 496f88afe1 Escape text passed to gfm by link_to_gfm 2012-09-19 19:42:26 -04:00
Dmitriy Zaporozhets bf625b7c92 polishing UI a bit. Added footer links for dashboard 2012-09-19 09:14:07 +03:00
Dmitriy Zaporozhets 64e76a87aa Notes votes: use icons instead of borders. Removed unnecessary padding 2012-09-18 09:17:55 +03:00
Dmitriy Zaporozhets 2aafd7cf4e Merge branch 'update-votes-when-adding-notes' of https://github.com/riyad/gitlabhq into riyad-update-votes-when-adding-notes 2012-09-18 08:56:54 +03:00
Dmitriy Zaporozhets 249cb19d96 Fix project update. Make slim form only for reversed comments 2012-09-18 08:54:17 +03:00
Dmitriy Zaporozhets b5442eb564 Merge pull request #1479 from tsigo/ref_switch 
Extract ref switcher into a partial
 2012-09-17 00:53:30 -07:00
Robert Speicher 465e40d3a6 Extract ref switcher into a partial 
Also moves onchange JS to projects.js.coffee
 2012-09-16 12:07:57 -04:00
Robert Speicher 4247ccd340 Remove unused project/_refs partial 2012-09-16 11:53:36 -04:00
Robert Speicher 95bd93fe1a Remove Projects#team action 
Uses TeamMembers#index instead, to be more RESTful
 2012-09-16 10:07:06 -04:00
Riyad Preukschas b8113334a8 Highlight voting notes for issues and merge requests 2012-09-15 11:54:46 +02:00
randx 348def0344 Init mr comments when naviagate via ajax to diff 2012-09-15 09:58:16 +03:00
randx 9159be3a50 Fix MR diff comments. Fix wiki comments loading error 2012-09-15 09:49:21 +03:00
randx caeb65b189 Merge branch 'change-notes-order' of https://github.com/riyad/gitlabhq into riyad-change-notes-order 2012-09-15 01:02:58 +03:00
Riyad Preukschas 07eec9c66a Update Notes JS for reversed notes 2012-09-14 21:41:57 +02:00
Riyad Preukschas 7563abbe49 Add 'notes/reversed_notes_with_form' partial 2012-09-14 21:41:57 +02:00
Riyad Preukschas e1ca155c95 Extract 'notes/per_line_notes_with_reply' partial 2012-09-14 21:41:57 +02:00
Riyad Preukschas a3dbd99068 Extract 'notes/per_line_note_link' partial 2012-09-14 21:41:57 +02:00
Riyad Preukschas c6d71b7b8e Rename 'notes/per_line_show' partial to 'notes/per_line_note' 2012-09-14 21:41:57 +02:00
Riyad Preukschas dd1b3177c9 Renamed 'notes/notes_list' partial to 'notes/notes' 2012-09-14 21:41:57 +02:00
Riyad Preukschas 4fc66ead4f Rename 'notes/show' partial to 'notes/note' 2012-09-14 21:41:57 +02:00
Riyad Preukschas 29c71f2fb9 Rename 'notes/reply_button' partial to 'notes/per_line_reply_button' 2012-09-14 21:41:57 +02:00
Riyad Preukschas c02e3f2104 Rename 'notes/form' partial to 'notes/common_form' 2012-09-14 21:41:57 +02:00
Riyad Preukschas 3c02c93f08 Remove 'notes/load' partial 2012-09-14 21:41:56 +02:00
Riyad Preukschas 8fb70d924d Rename 'notes/create_*' partials 2012-09-14 21:41:56 +02:00
Riyad Preukschas 61eb650db0 Rename 'notes/notes' partial to 'notes/notes_with_form' 2012-09-14 21:41:56 +02:00
Riyad Preukschas cee230a158 Update JS for adding and removing diff line notes 2012-09-14 21:41:56 +02:00
Riyad Preukschas 653f7ec4fb Update links for inline comments to use data-* attributes 2012-09-14 21:41:56 +02:00
Riyad Preukschas 20e009a40a Update diff comments order and rendering 2012-09-14 21:41:56 +02:00
Riyad Preukschas e802d00996 Completely redo loading of notes with JS 2012-09-14 21:41:56 +02:00
Riyad Preukschas 1416401753 Fix markup 2012-09-14 21:41:56 +02:00
Riyad Preukschas 8b6dba749a Reorder notes view elements 2012-09-14 21:41:56 +02:00
randx 759fb518eb fix event issue when event for left project + project removed 2012-09-14 18:46:40 +03:00
Dmitriy Zaporozhets dc37c8aaae Refactored profile area 2012-09-14 19:13:25 +03:00
randx 9329dfbfc5 Show inline providers icons on login page 2012-09-12 19:01:52 +03:00
randx acc5302c3f improve profile layout after omniauth changes 2012-09-12 18:56:44 +03:00
Dmitriy Zaporozhets fa4150d47d Cleanup after omniauth 2012-09-12 08:23:20 +03:00
Dmitriy Zaporozhets 486de8c3f4 Refactoring auth 2012-09-12 07:48:22 +03:00
Dmitriy Zaporozhets 621affecb5 Merge branch 'master' of https://github.com/funglaub/gitlabhq into funglaub-master 
Conflicts:
	Gemfile.lock
	app/helpers/application_helper.rb
	app/views/devise/sessions/new.html.erb
	db/schema.rb
 2012-09-12 06:49:52 +03:00
Dmitriy Zaporozhets 40eec08c99 Merge pull request #1409 from riyad/update-votes 
Update votes for issues and merge requests
 2012-09-11 23:08:19 -07:00
randx 0523b4265b Application logger 2012-09-11 23:24:53 +03:00