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

2321 commits

Author SHA1 Message Date
Dmitriy Zaporozhets cd15e89135 Merge pull request #2008 from Partugal/patch-default-order 
add order for projects admin page
 2012-11-19 04:11:18 -08:00
Dmitriy Zaporozhets 6878f55620 Bigger file name for commits diff 2012-11-19 14:01:40 +02: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
Sergey Linnik bb3fc1e04e add order to projects admin page 2012-11-18 22:36:22 +04:00
Valeriy Sizov e226551e81 Fix hooks for merge request which were accepted by web-interface 2012-11-18 19:56:29 +02: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 51f48392ab Fix type error if there is a different location hash 2012-11-17 22:26:22 +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
Alexey Loktionov 31bf0cd876 fix projects sorting; fix Postgresql issue with LIMIT and DISTINCT; fix query performance 2012-11-16 22:31:17 +04:00
Marin Jankovski 19e8473eb7 Cannot remove user that owns a project. 
Cannot remove user that owns a project.

Make lines shorter, set alert, use path instead of url.
 2012-11-16 14:47:07 +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
Riyad Preukschas ece563296b Fix Notes JS 
Also fixes #1983
 2012-11-14 14:36:51 +01:00
Riyad Preukschas 578cf89812 Fix specs 2012-11-14 01:20:37 +01: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
Dmitriy Zaporozhets 283a9c7b7d Fix margin-right for some avatars 2012-11-10 23:45:13 +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
Riyad Preukschas 45dcb1b5c4 Add jQuery.ScrollTo 2012-11-09 23:35:02 +01:00
Saito b664b784f1 linguist and web browser will take care of mimetype and encoding problem. 2012-11-10 01:06:20 +08: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
Riyad Preukschas be4138af75 Log caught exceptions 2012-11-06 21:16:47 +01:00
Dmitriy Zaporozhets 96b2959fe3 Styled chosen css. Lighter box shadow for blocks 2012-11-06 19:31:01 +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 ba567c8d76 Merge pull request #1914 from tsigo/issue/1910 
Fix double icon on header button hover
 2012-11-05 03:27:48 -08:00
Valeriy Sizov 4f04d7df66 Merge pull request #1915 from tsigo/issue/1912 
Fix rendered action for password change failure
 2012-11-05 01:29:03 -08:00
Robert Speicher 89d9319a79 Fix rendered action for password change failure 
Closes #1912
 2012-11-04 16:47:37 -05:00
randx f082c8ae2a Decouple and refactor GraphCommit 2012-11-04 23:43:33 +02:00
Robert Speicher 97bf7ac397 Fix double icon on header button hover 2012-11-04 16:29:44 -05: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
Robert Speicher badb092a2d Don't initialize Tree History unless tree-slider is present 
This was breaking breadcrumb links on non-Tree pages
 2012-11-01 17:57:12 -04:00
Robert Speicher 57e6777b3c Remove "remote" attribute from Tree breadcrumb links 
See https://github.com/gitlabhq/gitlabhq/pull/1665#discussion_r1804447
 2012-11-01 17:56:39 -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
Dmitriy Zaporozhets 8272e18e57 Project path validation: array of not allowed paths 2012-10-30 13:27:15 +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
Dmitriy Zaporozhets 50a6c614b5 Merge pull request #1818 from riyad/refactor-satellite-actions 
Refactor Satellite Code
 2012-10-29 04:12:26 -07: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 646bad43e9 Fix styles 2012-10-27 18:27:51 +02:00
Riyad Preukschas 3d0197246e Use #author_link for blame, commits and tree 2012-10-27 18:27:47 +02:00
Riyad Preukschas c78359a84b Generalize CommitDecorator#author_link to #person_link 2012-10-27 18:15:00 +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
Riyad Preukschas 2f5e44a02d Enable/disable from buttons on all input events (not just key events) 
Fixes #1836
 2012-10-27 17:00:51 +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 700a784bc9 Refactor EditFileAction#update and rename it to commit! 2012-10-26 01:59:50 +02:00
Riyad Preukschas fba8ad5607 Move Gitlab::Satellite into the Satellite module 2012-10-26 00:56:24 +02:00
Riyad Preukschas 5f16687805 Update arguments for Gitlab::Satellite::EditFileAction#initialize 2012-10-26 00:39:23 +02:00
Riyad Preukschas 55779b00ea Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction 2012-10-26 00:33:53 +02:00
Riyad Preukschas 8c89beb6f9 Change argument order for satellite actions to always start with the user 2012-10-26 00:26:47 +02:00
Riyad Preukschas 78235edda8 Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction 2012-10-26 00:19:01 +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
Scott Holden 2335d7b9cf Fix broken Note scopes with lambdas, 4.0 compat 
Without lambdas, Date.today will be evaluated in the class body.
For it to have a running scope of last week etc, it will need to
be evaluated each time the scope is called.
In Rails 4.0, lambdas will be required for all scopes, so not a bad
idea to go ahead and change them all now.
 2012-10-24 21:54:15 -07: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 b7a9e41bd2 Handle perfomance issue with team import. Model specs 2012-10-24 14:52:17 +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 9902f1af6e Reduce line-height for commits diff lines 2012-10-22 23:49:21 +03:00
randx e51b2d58e7 Restyled last push widget. Increased line-height for td in tables 2012-10-22 23:37:50 +03:00
randx 83dc5f9362 Fix issue with removing group 2012-10-22 21:21:34 +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
Riyad Preukschas d4e3664067 Fix bug in MergeRequest#mark_as_unmergable 2012-10-20 15:27:34 +02:00
Riyad Preukschas 122769e358 Refactor Gitlab::Merge 
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
 2012-10-20 15:25:48 +02:00
Nihad Abbasov 414080cb03 remove unnecessary snippets.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov c28722689d merge graph.js into projects.js 2012-10-19 03:41:10 -07:00
Nihad Abbasov 41ec540033 remove unnecessary loader.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
Nihad Abbasov 46921e690e cleanup main.coffee 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
Riyad Preukschas aef2031ad6 Add CommitDecorator#author_link 2012-10-18 20:16:52 +02:00
Riyad Preukschas b3a5f0a78d Fix wrong parameter order in Team#team_member_by_name_or_email 2012-10-18 20:16:52 +02:00
Dmitriy Zaporozhets c007325451 Merge pull request #1712 from riyad/use-gem-for-emoji 
Use gem for Emoji
 2012-10-18 00:28:47 -07:00
Riyad Preukschas 413778b645 Rename NoteObserver methods and clarify things 2012-10-18 01:14:10 +02:00
Riyad Preukschas 853c69c48a Reorder and group methods in Notify mailer 2012-10-18 01:14:09 +02:00
Riyad Preukschas ce91014730 Fix use of Emoji 2012-10-18 01:10:35 +02:00
randx e0c43c46dd Added project has_one :last_event assoc. Fixed tab line-height after font-awesome. Increased projects per page on dashboard 2012-10-17 22:02:52 +03:00
Valeriy Sizov 8e989d4863 revert all wiki changes 2012-10-17 16:14:20 +03:00
Valeriy Sizov 31f1cebe4b Wiki style: move styles to right place 2012-10-17 15:17:27 +03:00
Valeriy Sizov 607d8b7970 Wiki Style Fixing 2012-10-17 15:09:16 +03:00
Valeriy Sizov 7166739086 Merge pull request #1715 from riyad/use-font-awesome 
Use Font Awsome for icons
 2012-10-17 03:08:12 -07: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 789e4b848c Import Font Awesome styles 2012-10-16 20:48:32 +02:00
Riyad Preukschas fa4c38f32b Fix issues close and reopen button text and styles 2012-10-16 19:17:48 +02:00
Riyad Preukschas 8e8d82d49a Only allow editing text files 2012-10-16 12:45:48 +02:00
Riyad Preukschas ad5a6a4ae1 Improve flash messages in tree#update 2012-10-16 12:45:30 +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 536eb8e828 Remove #history_path and #mb_size from TreeDecorator 2012-10-15 23:42:44 +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
Robb Kidd 9588a23242 Fix notification for notes on a wall. 
The fact that Notes on Walls have a noteable_type value of "nil" got
lost in the refactoring of the observer.
 2012-10-13 14:37:36 -04: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 0b3e9fd218 WebEditor: Check if save is possible 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 3b5c7b6e9a minor code style fixing 2012-10-12 20:07:23 +03:00
Valeriy Sizov f6a8e69449 WebEditor: base form 2012-10-12 20:07:23 +03: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
Valeriy Sizov 4083d01af6 Merge pull request #1682 from riyad/improve-search-suggestions 
Improve (static) suggestions in global search field
 2012-10-12 03:08:14 -07:00
Riyad Preukschas 64008b9ec7 Improve search suggestions 2012-10-12 01:02:28 +02:00
Robb Kidd 378fe076b6 Reduce complexity: replace case statement with method lookup. 2012-10-11 13:27:58 -04:00
Dmitriy Zaporozhets baf94bd732 Merge pull request #1675 from robbkidd/separate_mr_observer 
Separate observing of Note and MergeRequests
 2012-10-11 09:35:21 -07:00
Robb Kidd d32a5d7eef Clean up indenting in new observer. 2012-10-11 11:05:13 -04:00
Robb Kidd 16ceae895e Separate observing of Note and MergeRequests 
* Move is_assigned? and is_being_xx? methods to IssueCommonality

  This is behavior merge requests have in common with issues. Moved
  methods to IssueCommonality role. Put specs directly into
  merge_request_spec because setup differs for issues and MRs
  specifically in the "closed" factory to use.

* Add MergeRequestObserver. Parallels IssueObserver in almost every way.

  Ripe for refactoring.

* Rename MailerObserver to NoteObserver

  With merge request observing moved out of MailerObserver, all that
  was left was Note logic. Renamed to NoteObserver, added tests and
  updated application config for new observer names. Refactored
  NoteObserver to use the note's author and not rely on current_user.

* Set current_user for MergeRequestObserver

  IssueObserver and MergeRequestObserver are the only observers that
  need a reference to the current_user that they cannot look up on
  the objects they are observing.
 2012-10-10 17:59:25 -04: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
Riyad Preukschas 3f72af9994 Make notes for merge requests include commit notes and add helpers 2012-10-10 12:06:30 +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
Riyad Preukschas eb92813757 Move emoji auto-complete helper to ApplicationHelper 2012-10-10 00:53:42 +02:00
Robert Speicher 702133c0e2 Remove unused history_path instance variable 2012-10-09 18:39:03 -04: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
randx 679d0d6d76 Context refactoring. Move Issues list, Search logic to context 2012-10-09 22:09:46 +03:00
randx 63fe042d97 project.issues_labels method 2012-10-09 20:39:06 +03: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
Riyad Preukschas bbd92e57cb Add emoji_for_completion helper 2012-10-09 14:47:42 +02:00
Dmitriy Zaporozhets 41e53eb980 Annotated 2012-10-09 11:14:17 +03:00
Valeriy Sizov dc33f71b18 Merge pull request #1656 from zzet/refactoring 
Refactoring
 2012-10-09 01:17:38 -07:00
randx c348284fed Reduce count of projects on dashboard to 20 2012-10-09 10:01:07 +03: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
Andrey Kumanyaev df7c52489a simple refactoring 2012-10-09 04:10:04 +04:00
Valeriy Sizov a635b9da97 Revert "Do not allow removal of a project owner user." 
This reverts commit 927d0cc267.
 2012-10-08 15:57:30 +03:00
Valeriy Sizov fc3c0592db Merge pull request #1651 from dosire/user_can_be_removed_if_its_not_a_project_owner 
Do not allow removal of a project owner user.
 2012-10-08 05:42:47 -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 bcdb168709 Fix dashboard atom feed routes 2012-10-08 14:17:46 +03: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
Marin Jankovski 927d0cc267 Do not allow removal of a project owner user. 2012-10-08 12:41:25 +02: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
Nihad Abbasov 72395d7f6e no need to add fonts to assets path 2012-10-05 07:23:58 -07:00
Nihad Abbasov 317c928198 improve emoji checking performance 2012-10-05 07:23:58 -07:00
Valeriy Sizov 76c4e83193 Minore code-style fixes 2012-10-04 13:40:40 +03: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
Robert Speicher b5328879f5 Rename tree.js to tree.js.coffee 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 c8412bc9ed Dont change params hash. Use dup instead 2012-10-03 15:02:02 +03:00
Dmitriy Zaporozhets ce1b79afa9 SQL Fixes 2012-10-03 14:26:37 +03:00
Dmitriy Zaporozhets 8b76e30656 Spianch test for group dashboard 2012-10-03 13:42:17 +03:00
Valeriy Sizov b5f9d29f55 Merge pull request #1617 from dosire/reject-ssh-keys-that-break-gitolite 
Reject ssh keys that break gitolite
 2012-10-03 03:18:08 -07:00
Dmitriy Zaporozhets 224fb5770c Added ability to manage groups from admin 2012-10-03 12:49:43 +03:00
Robert Speicher 5e3be9cda0 Cache the value of safe_message 
Also, just for extra paranoia, only call safe_message once in the
decorator methods

Adds specs to make sure it still works
 2012-10-02 19:00:41 -04: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
Dmitriy Zaporozhets fa3ae24ca7 Group entity. Group has many projects 2012-10-02 18:17:12 +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 2022ae69df Clarify deletion messages 2012-09-30 15:04:43 +02: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
Riyad Preukschas c2303737ba Fix double ref_type in push event when removing branch or tag 2012-09-30 00:53:04 +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
randx 7ded8584a5 blue hover 2012-09-27 23:59:41 +03:00
randx 9cabe04368 tests for: Profile -> History 2012-09-27 23:23:11 +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
Robert Speicher 1502be325d Minor doc fix 2012-09-27 13:12:11 -04: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 933c5e4146 update new controllers 2012-09-27 13:44:53 +02: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
Nihad Abbasov 2088d2eba8 replace ^ and $ anchors in regexp with \A and \z respectively 
http://guides.rubyonrails.org/security.html#regular-expressions
 2012-09-27 02:56:20 -07:00
Nihad Abbasov c7a1779b22 .map -> .pluck 2012-09-27 02:55:57 -07:00
Nihad Abbasov 841e4fbd08 cosmetical cleanup of models 2012-09-27 02:05:53 -07:00
Nihad Abbasov 2a4359a572 annotate models 2012-09-27 02:05:53 -07:00
Dmitriy Zaporozhets a8870e87e4 Fix blame markup & breadcrubs for commits 2012-09-27 11:58:41 +03:00
Dmitriy Zaporozhets 2c8d3c33ff Fixed ref switcher 2012-09-27 09:53:42 +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 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 afc4a75499 Use Rails.root.join where appropriate 2012-09-26 16:32:26 -04:00
Robert Speicher f8c02f6e39 Add branches and tags Repo methods 
Simplifies the actions in RepositoriesController
 2012-09-26 16:32:26 -04:00
Robert Speicher 2df3b310f9 Rename branches and tags Repo methods to branch_names and tag_names 2012-09-26 16:32:26 -04:00
Robert Speicher 9f0e80591a Fix Repository role spec 2012-09-26 16:32:25 -04:00
Robert Speicher e9bd45060e Fix logs not showing in Tree for the root path 2012-09-26 16:32:25 -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 b6d6663e0e Fix the remaining actions in RefsController 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 6cb626ef51 Add Compare#index and Compare#create actions 
Create just redirects to our specially-formatted #show action
 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 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 545dc7e47d Fix atom feed links 2012-09-26 16:32:23 -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 95f0a41141 Fix Refs#switch 2012-09-26 16:32:23 -04:00
Robert Speicher 33126227af Remove check_token_auth filter 
Because of the way ExtractPaths works, `params[:format]` wouldn't
necessarily be available at the time this filter was running, and so it
would erroneously redirect to `new_user_session_path`
 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 5a5d214de4 Remove unused render_full_content filter 2012-09-26 16:32:22 -04:00
Robert Speicher a1e68a9120 Rename RefExtractor to ExtractsPath 
Update docs a bit
 2012-09-26 16:32:22 -04:00
Robert Speicher a8ea8d98a4 Update RefExtractor to handle atom feeds 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 e33cbb9b42 Add TreeController and spec 2012-09-26 16:32:21 -04:00
Robert Speicher 2ddb191706 Require 'github/markup' in Gemfile 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
Robert Speicher 5e1ef575df Add CommitController 2012-09-26 16:32:20 -04:00
Robert Speicher ed26ecae0c Add branches method to Repository role 2012-09-26 16:32:20 -04:00
Cyril bdf317addc layout selected by controller name 2012-09-26 22:27:44 +02:00
Cyril 078a8f0e66 factorize before_filters and layout for projects related controllers 2012-09-26 22:27:43 +02:00
Nihad Abbasov 83efcabc82 set activerecord whitelist_attributes to true 2012-09-26 11:18:35 -07:00
randx dddb5b5de9 fix left project event 2012-09-26 21:05:04 +03:00
randx 0261b0c64c Project activity inifinite scroll paging 2012-09-26 21:01:54 +03:00
Dmitriy Zaporozhets 16e67fd8be Merge pull request #1364 from AlexDenisov/fix_project_access_notification 
Project access notifications fixed
 2012-09-26 07:21:54 -07:00
Dmitriy Zaporozhets 9270b6c3c7 Fix milestone calendar, Removed unnecessary selects from admin 2012-09-26 16:49:20 +03:00
Alex Denisov c09d233611 Merge branch 'master' into fix_project_access_notification 2012-09-26 16:14:47 +03:00
Dmitriy Zaporozhets 3c132f2e68 Merge pull request #1561 from dosire/mass_assignment 
Protect users projects_limit from mass assignment.
 2012-09-26 05:45:16 -07:00
Marin Jankovski 5928388b1c Protect users projects_limit from mass assignment. 2012-09-26 13:20:44 +02:00
Nihad Abbasov 30ee53624b Merge pull request #1553 from jouve/simplify_controllers1 
remove duplicate before_filter
 2012-09-25 14:05:26 -07:00
Cyril 252d3a0c9d remove duplicate before_filter 2012-09-25 22:38:11 +02:00
Dmitriy Zaporozhets e584f14857 Merge pull request #1534 from iamntz/emoji_alignment 
Removed float on emoji
 2012-09-25 12:44:03 -07: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
Sytse Sijbrandij f3ce02b5c9 Reject ssh keys that break gitolite. 
Failing test.

Working check.
 2012-09-24 16:48:10 +02: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
Staicu Ionut c701507b6c Removed float on emoji 
-`remove comment` button will not make the text jump anymore.
 2012-09-24 10:06:41 +03:00
Nihad Abbasov 9c75fcbef1 auto complete team member mentions 2012-09-23 09:52:01 -07:00
Nihad Abbasov 80bcba4ee2 install jquery-atwho-rails 2012-09-23 08:53:48 -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
Alex Denisov e6ce47291b master merged 2012-09-20 10:25:29 +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
randx 4ecf23d2ad Fix ref select search width 2012-09-18 21:05:33 +03:00
randx aaec545a67 Gitlab styled tabs. Better ref selector 2012-09-18 20:50:34 +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 b24346fa2b Fix permissions for TeamMembers#index 2012-09-16 10:56:32 -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
Robert Speicher 8cfb197dfc Remove redundant access check for Issues#destroy 
We were already calling `authorize_admin_issue!` in a before filter with
the same permission checks, so this deleted check wasn't actually doing
anything.
 2012-09-16 10:06:29 -04:00
Robert Speicher a0893b4d58 Remove non-existent "close" action from authorize_modify_issue filter 2012-09-16 10:06:29 -04:00
Robert Speicher 925183ed7a Add an AdminController base class for Admin controllers 
Handles stuff that's shared across admin controllers.
 2012-09-16 10:06:29 -04:00
Robert Speicher 89069dc5f7 Remove unused ProfileController#password action 2012-09-16 07:38:14 -04:00
Riyad Preukschas 6aebb76b5d Update votes when creating or refreshing notes 2012-09-15 11:55:17 +02: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
randx a82977c648 A bit of test refactoring 2012-09-15 01:00:59 +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 e63d7b6029 Rename note.js to notes.js 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 6ffec9a298 Update Note to load notes in the right order 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
Peter Gonda 795cc9b716 Repaired Get patch 2012-09-14 15:57:25 +02:00
randx 4782163c7a Use default tw thubmnails 2012-09-12 19:06:32 +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 048d47e626 Refactorn oauth & ldap 2012-09-12 09:23:16 +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
Riyad Preukschas 0bfcc574b6 Extract displaying votes into partials 2012-09-11 16:48:11 +02:00
Riyad Preukschas f7c70eaaed Add *votes_in_percent 2012-09-11 16:47:59 +02:00
Dmitriy Zaporozhets 4903910390 Merge pull request #1438 from SaitoWu/bugfix/1434 
tree view need use ascii-8bit, file name need be utf8.
 2012-09-11 05:43:56 -07:00
Nihad Abbasov 5a90712645 don't load commit logs when viewing blob 2012-09-11 05:35:16 -07:00
Saito 96d4f22e53 tree view need use ascii-8bit, file name need be utf8. 2012-09-11 19:18:14 +08:00
Dmitriy Zaporozhets 1c08cb404d Merge pull request #1424 from elvanja/issue-1343-empty-string-fix 
FIX: Empty string in commit message
 2012-09-11 00:08:51 -07:00
Vanja Radovanović 7e2846fb57 using blank?, much shorter 2012-09-10 17:32:31 +02:00
Dmitriy Zaporozhets 263b8af1c4 Merge pull request #1423 from u-minor/fix_ldap_login 
Fix haml template error for ldap login.
 2012-09-10 06:39:21 -07:00
Vanja Radovanović 8d171a8cbc fixed commit title when commit message is an empty string and ensured that link_to_gfm helper doesn't break on nil body 2012-09-10 14:40:35 +02:00
Dmitriy Zaporozhets 5604613025 Merge pull request #1415 from tsigo/chosen_behavior 
Reduce the amount of JavaScript written in views
 2012-09-10 04:43:21 -07:00
Minoru NAKATA a3d22297dc fix haml template error for ldap login. 2012-09-10 20:40:20 +09:00
Alex Denisov 77bfc591bf Merge 'master' branch 2012-09-10 09:19:15 +03:00
Dmitriy Zaporozhets 52d29f5d59 Project team page improved 2012-09-10 09:14:37 +03:00
Robert Speicher d6c384c20f Reduce the amount of JavaScript written in views 
Seeing `:javascript` all over Views feels like a code smell. This goes a
long way towards reducing the amount of JS in views, but there's still
plenty to be done on that front.
 2012-09-10 02:12:36 -04:00
Alex Denisov 1f240b09ed User left project event added 2012-09-10 00:27:47 +03:00
Alex Denisov a86bd87afc User joined project event added 2012-09-09 23:18:28 +03:00
Riyad Preukschas a5164ea2ed Show votes as a bar 2012-09-08 16:44:56 +02:00
Riyad Preukschas 5ca31aa252 Make issue buttons look more consistent with MRs 2012-09-08 16:07:51 +02:00
Riyad Preukschas 1271b4ce66 Update display of merge requests and issues to also show downvotes 2012-09-08 16:07:44 +02:00
Riyad Preukschas 7b0c7ae52c Add votes_count 2012-09-08 16:05:48 +02:00
Riyad Preukschas 2e0d5c2250 Add downvotes 2012-09-08 16:05:48 +02:00
Riyad Preukschas a2a0060034 Rename Upvote role to Votes 2012-09-08 16:05:48 +02:00
Riyad Preukschas 06c1a8a9ae Make notes recognize downvotes 2012-09-08 16:05:48 +02:00
Dmitriy Zaporozhets 7cc4b3f632 Merge pull request #1406 from riyad/markdown-code-fixes 
Markdown code fixes
 2012-09-07 21:19:31 -07:00
Riyad Preukschas 9a4c22d395 Remove unnecessary check in Markdown helper 2012-09-08 01:11:32 +02:00
Riyad Preukschas f4a90bc9f3 Add emoji docs to Markdown help 2012-09-08 01:09:12 +02:00
Riyad Preukschas 130520fa5e Reorder blocks in Markdown help 2012-09-08 01:09:09 +02:00
Dmitriy Zaporozhets 7b50a7c99d Merge pull request #1402 from AlexDenisov/preselected_milestone_while_create_new_issue 
Preselected milestone and assignee while create new issue
 2012-09-07 11:10:27 -07:00
Alex Denisov 1b83af6eed IssueController#new refactored 2012-09-07 20:59:12 +03:00
randx 367e17cc84 5xx error status code for gitolite & encoding error 2012-09-07 20:47:52 +03:00
randx 048117c05d projects helper added 2012-09-07 19:57:13 +03:00
Alex Denisov f789476241 Merge branch 'master' into preselected_milestone_while_create_new_issue 2012-09-07 17:20:20 +03:00
Alex Denisov b462b0c6eb Pre-selected assignee implemented 2012-09-07 16:52:48 +03:00
Alex Denisov 26552051b7 Pre-selected milestone implemented 2012-09-07 16:35:59 +03:00
Dmitriy Zaporozhets fed6ab2481 Change representation of team members. Group by role 2012-09-07 10:42:41 +03:00
Alex Denisov 85db51f660 don't send notification when UsersProject destroyed 2012-09-07 10:23:45 +03:00
Dmitriy Zaporozhets 61c7449321 Bulk user add on project -> new team member 2012-09-07 09:50:35 +03:00
Alex Denisov ed4fbcf6b0 Merge branch 'master' into fix_project_access_notification 2012-09-07 09:39:34 +03:00
Dmitriy Zaporozhets 4f8a4aa44c Merge pull request #1384 from tsigo/emoji 
Emoji!
 2012-09-06 23:05:18 -07:00
Dmitriy Zaporozhets 79021e674b Split gitolite backend. Use gitolite_config methods moved to separate class 2012-09-07 08:16:29 +03:00
Robert Speicher 8fdeb43c36 Fix Help/Markdown: Take 2 2012-09-06 17:20:57 -04:00
Robert Speicher 34a48d55cc Revert "Change @project instance variable to a local in views/help/markdown" 
This reverts commit 6471d8c652.
 2012-09-06 17:17:56 -04:00
Robert Speicher bde19c061a Update failure message for UsersProject uniqueness validation 
Was "User has already been taken", is now "User already exists in
project".
 2012-09-06 16:51:28 -04:00
Robert Speicher 2faa4bba40 Update Note#upvote? to support emoji voting 2012-09-06 15:31:25 -04:00
Robert Speicher 8808c5fa8d Merge branch 'master' into emoji 2012-09-06 15:23:42 -04:00
Dmitriy Zaporozhets a595f8944a Merge pull request #1392 from NARKOZ/refactoring 
refactor factory specs
 2012-09-06 08:11:41 -07:00
Nihad Abbasov 46b9aafc39 add missing selector to projects.js 2012-09-06 07:56:33 -07:00
Dmitriy Zaporozhets b57620e23b Merge branch 'normalize_capitalization' of https://github.com/AlexDenisov/gitlabhq into AlexDenisov-normalize_capitalization 2012-09-06 17:36:04 +03:00
Nihad Abbasov 66684d6d50 move code from application.js to separate file 2012-09-06 05:47:13 -07:00
Nihad Abbasov 88d394d396 cleanup projects.coffee 2012-09-06 05:44:44 -07:00
Nihad Abbasov e7c2ee57aa delete unnecessary team.js 2012-09-06 05:06:01 -07:00
Nihad Abbasov 06acc115ed rewrite snippets.js in coffeescript 2012-09-06 04:51:42 -07:00
Nihad Abbasov f8b588808e rewrite loader.js in coffeescript 2012-09-06 04:50:01 -07:00
Nihad Abbasov 08d9421dd9 rewrite graph.js in coffeescript 2012-09-06 04:32:31 -07:00
Nihad Abbasov 60e18e2636 rewrite admin.js in coffeescript 2012-09-06 04:32:01 -07:00
Nihad Abbasov c106bb7096 minor refactoring of commits controller 2012-09-06 04:03:46 -07:00
Alex Denisov 562af7a6a2 Merge branch 'master' into normalize_capitalization 2012-09-06 11:40:56 +03:00
Alex Denisov 09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
Robert Speicher 90f587f4ee Move the entire gfm method to Gitlab::Markdown, which will be a module now 2012-09-05 16:06:20 -04:00
Robert Speicher d480a478c1 Add emoji image files 2012-09-05 16:04:41 -04:00
randx 21bfd1e7fc minor css improvements 2012-09-05 23:00:10 +03:00
Nihad Abbasov 0b559cdece add validations for boolean attributes 2012-09-05 04:01:11 -07:00
Dmitriy Zaporozhets 982a4095c1 Use tw style for some buttons. Improved deploy key UI 2012-09-05 08:56:59 +03:00
Robert Speicher 5e1c63d3f0 Move load_refs out of ApplicationController and into CommitsController 
That was the only place it was used.
 2012-09-05 01:13:41 -04:00
Robert Speicher a9f275bc20 Fix load_refs in ApplicationController after default_branch change 
As a last resort it was calling a method that didn't exist. Woops!
 2012-09-05 01:12:44 -04:00
Robert Speicher 443e23e61a Add Repository#discover_default_branch and add it to PushObserver 2012-09-05 01:01:20 -04:00
Robert Speicher f06d98e907 Add SetDefaultBranchDefaultToNil migration 
default_branch now defaults to nil, not 'master'. It will be set after the first
push by discover_default_branch.
 2012-09-05 01:00:07 -04:00
Robert Speicher 0bc4ecfedd Change projects/empty to include the clone_panel partial instead of duplicating 2012-09-04 12:05:21 -04:00
Robert Speicher 82a3996883 Remove projects/_show partial 
I have no earthly idea what this file was for, but I couldn't find it being
rendered anywhere.
 2012-09-04 12:05:21 -04:00
Robert Speicher a463353773 Add "empty_repo?" method to Repository role 
Replaces two calls that this method simplifies
 2012-09-04 12:05:21 -04:00
Robert Speicher 7e76610d0a Update the projects js file to coffeescript; refactor the clone panel switcher 2012-09-04 12:05:20 -04:00
Robert Speicher c1ff89fa2a Rename projects.js to projects.js.coffee 2012-09-04 11:30:49 -04:00
Dmitriy Zaporozhets c347fd3f88 Merge pull request #1366 from tsigo/markdown_help 
Change @project instance variable to a local in views/help/markdown
 2012-09-04 00:28:04 -07:00
Robert Speicher 6471d8c652 Change @project instance variable to a local in views/help/markdown 
It was erroneously appending the project name to the page's title, even
though the Help system isn't specific to one project.
 2012-09-04 03:18:26 -04:00
Robert Speicher d29827433d Update User#identifier to conform to Gitolite 2.x's user pattern 
Also modifies the specs a bit because I can't help myself.

Closes #480
 2012-09-04 00:20:17 -04:00
Robert Speicher b44e9a08d5 Add Milestone link to API help TOC 
[ci skip]
 2012-09-03 20:38:41 -04:00
randx 5db2dbdcf1 fix browse file css 2012-09-03 22:57:34 +03:00
randx f557686eb2 git clone panel available on files tab too 2012-09-03 22:30:14 +03:00
Alex Denisov 38b17e4e06 Merge branch 'master' into fix_project_access_notification 2012-09-03 22:20:29 +03:00
randx 8ca0b75d05 Tables refactored 2012-09-03 21:53:16 +03:00
Alex Denisov af63607a5c test_after_commit gem added 2012-09-03 21:46:17 +03:00
Alex Denisov 1f1c8094fe After commit instead of after_update 2012-09-03 20:48:38 +03:00
Dmitriy Zaporozhets c7cfe3d83b devise session templates to haml. Fix problem with missing message in commit 2012-09-03 08:15:07 +03:00
Dmitriy Zaporozhets 6997543ac2 Merge pull request #1351 from tsigo/nonrelative_resque 
Give Resque route a name and use that for the iframe src
 2012-09-02 11:58:13 -07:00
Dmitriy Zaporozhets f9711cd81a Merge pull request #1355 from tsigo/gfm_spec_cleanup 
GFM spec redesign
 2012-09-02 11:57:33 -07:00
Robert Speicher 40d619107f Add link_title to CommitDecorator 2012-09-02 13:40:14 -04:00
Robert Speicher 8db2a59d0b Add StaticModel role, and add it to Commit model 
Instead of doing this:

    link_to(commit.id, project_commit_path(project, id: commit.id))
    Note.create(noteable_id: commit.id, noteable_type: "Commit", ...)

It lets us do this:

    link_to(commit.id, project_commit_path(project, commit))
    Note.create(noteable: commit, ...)
 2012-09-02 13:40:07 -04:00
randx aecbd313bc Fix glm by adding id and classes to sanitize white attrs 2012-09-02 15:25:54 +03:00
randx beb5e1bd6b Sanitize glm helper 2012-09-01 23:35:04 +03:00
randx adeeae9f73 Few fixes for ~ 1000px resolution 2012-09-01 22:21:28 +03:00
Robert Speicher 0de5d08e37 Give Resque route a name and use that for the iframe src 
Closes #1350
 2012-08-31 19:28:32 -04:00
Florian Unglaub 0dd94cd86e DRY'ed up the user model 2012-08-31 16:44:23 +02:00
Florian Unglaub 1b0198f1d3 save newly created users directly in the model 2012-08-31 16:24:12 +02:00
Florian Unglaub 6d6c7a17ea Allow single-sign-on with Omniauth 2012-08-31 15:45:50 +02:00
Dmitriy Zaporozhets ed954ebae2 Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications 
Issue status changed notifications
 2012-08-31 00:51:31 -07:00
randx 65abd8b20a Freeze project path in admin area 2012-08-31 09:05:44 +03:00
randx 5e510ada7a Js validation for title presence in issue, mr, milestone 2012-08-30 22:28:45 +03:00
randx b9ff0c79b4 Changed filters to readable one. Styled some stuff 2012-08-30 22:15:34 +03:00
randx 4a6596af27 Fixed bunch of js bugs with comments. Also added development tips 2012-08-30 21:31:55 +03:00
randx 92137b7beb Removed class 'small' for some buttons. Fixed issue creation 2012-08-30 20:00:16 +03:00
randx d246a68a24 fix project.last_activity spec 2012-08-30 19:45:05 +03:00
Dmitriy Zaporozhets cd3d50caf2 Changed colors for buttons. Imporved preview area. Added clone panel to empty project 2012-08-30 09:27:02 +03:00
Dmitriy Zaporozhets 4e47402852 Fixed project last_activity. Links color changed a bit 2012-08-30 09:09:42 +03:00
Dmitriy Zaporozhets 793db070f0 Restyled projects list on dashboard 2012-08-30 08:13:36 +03:00
randx 51558bd57a Refactoring scss & improving some UI elements 2012-08-29 22:29:50 +03:00
randx 1dd938d20c SCSS refactoring & cleanup. First iteration 2012-08-29 21:23:43 +03:00
Alex Denisov 2703fe3e72 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:42:15 +03:00
Alex Denisov 05af5655a7 Merge branch 'master' into issue_status_changed_notifications 2012-08-29 11:21:14 +03:00
Alex Denisov 43cad71f1a Duplicate code removed from IssueObserver#after_update 2012-08-29 10:50:35 +03:00
Alex Denisov 2cb0a62f7d Notification sends to issue author and assignee if issue being reopened or closed 2012-08-29 10:48:17 +03:00
Alex Denisov 4d65532158 Issue_status_changed email added 2012-08-29 09:49:39 +03:00
randx e5adca1b81 Preview as button. Disable note submit unless content 2012-08-29 08:13:38 +03:00
Robert Speicher 8a49cdc3b4 Add milestone API docs to doc/README and views/help/api 
Also removes `closed` attribute option from create action.
 2012-08-29 08:45:00 -04:00
Dmitriy Zaporozhets adc71b6a6a Fix test i broke with ssk key validation. Added Key.user_id as attr_protected 2012-08-29 07:58:22 +03:00
Dmitriy Zaporozhets 5afb16e496 Add ssh key validation 2012-08-29 07:13:29 +03:00
randx ad3a88cfd3 Prepared for gitolite v3 2012-08-29 02:03:04 +03:00
Dmitriy Zaporozhets 1f5e2658f5 Merge pull request #1412 from tsigo/more_coffeescript 
Convert main.js to CoffeeScript
 2012-09-09 06:48:33 -07:00
Robert Speicher 5dcca7e480 Remove some JS that is no longer used 2012-09-09 07:28:42 -04:00
Robert Speicher 3551df8eb1 Minor main.js refactor and docs 2012-09-09 07:28:41 -04:00
Robert Speicher ad1aa517c7 Add "enable" and "disable" jQuery functions 
Handles (un)setting the disabled attribute and adding/removing the
'disabled' class
 2012-09-09 07:28:41 -04:00
Robert Speicher 3b89f14090 Convert main.js to coffee 
Remove duplicate 's' hotkey code
 2012-09-09 07:28:41 -04:00
Robert Speicher 93daa8c568 Move main.js to main.js.coffee 2012-09-09 07:28:41 -04:00
Robert Speicher 1c01536829 Fix spelling of "empty" in disableButtonIfEmptyField function name 2012-09-09 07:28:41 -04:00
Dmitriy Zaporozhets 2e8b5ebefd Merge pull request #1386 from tsigo/github_markup 
Use GitHub::Markup to parse markup files
 2012-09-09 03:34:50 -07:00
miks 2e76342d72 typo fixed 2012-09-08 12:37:23 +03:00
miks 4226458faf Merge branch 'master' into project_users_api 2012-09-08 10:50:24 +03:00
miks 2dc0519277 bulk access roles update/deletion added 2012-09-06 23:14:42 +03:00
Robert Speicher 52c521ffe8 Use GitHub::Markup to parse markup files 
Closes #1382
 2012-09-05 16:52:49 -04:00
Robert Speicher b78fd0c130 Add github-markup gem 2012-09-05 16:50:03 -04:00
randx b03ee4666b Handle invalid ssh exception 2012-08-29 00:44:26 +03:00
randx 7cdc5b9e04 Use similar interface to access gitolite 
Simplified gitolite handle logic
Stubn over monkeypatch
Stub only specific methods in Gitlab:Gitolite
Moved grach auth to lib
added specs for keys observer
removes SshKey role
 2012-08-29 00:04:06 +03:00
Riyad Preukschas 1f1ce5fbd4 Revamp GFM user docs. 2012-08-27 21:20:26 +02:00
Riyad Preukschas 806695f491 Split and reformat markdown options and add refs to their docs. 
Also add hard_wrap option.
 2012-08-27 21:20:13 +02:00
Riyad Preukschas 58a581782b Update forms to show consistent link to GFM. 2012-08-27 20:55:01 +02:00
Dmitriy Zaporozhets cb35a80e49 Merge pull request #993 from veprbl/fix_archiving_prefix 
Download button: put files into a directory
 2012-08-27 11:04:00 -07:00
Dmitriy Zaporozhets cb6fcb6562 Merge pull request #1301 from Mikulas/help-web-hooks-typo 
fix web hooks help view commit count off by one
 2012-08-27 04:58:32 -07:00
Dmitriy Zaporozhets 65444ba311 Merge pull request #1307 from purwandi/master 
use high quality icon on folder icon
 2012-08-27 01:33:06 -07:00
Purwandi 28cc4de267 Replace folder icon to use high quality 2012-08-27 12:43:28 +07:00
Alex Denisov 3c96d1f0e1 Send notification on update UserProject relation (access changed) 2012-08-27 00:32:03 +03:00
Alex Denisov aaeb37419a Send notifiation on create UserProject relation (access granted) 2012-08-27 00:13:03 +03:00
randx 2c32574ac3 Project git clone panel 2012-08-25 23:39:01 +03:00
Dmitriy Zaporozhets efde86537a Merge pull request #1110 from gliptak/patch-1 
Display configured git repository location on error page
 2012-08-25 13:04:41 -07:00
Dmitriy Zaporozhets 79e936e632 Merge pull request #1300 from tsigo/spec_reorganize 
Spec cleanup/reorganization
 2012-08-25 13:03:44 -07:00
Mikuláš Dítě e0cd807020 fix web hooks help view commit count off by one 2012-08-25 20:48:30 +02:00
Robert Speicher 580ce4f2d8 Minor cleanup to Milestone model and spec 
Back-ported from my still-in-progress major cleanup.
 2012-08-25 14:19:16 -04:00
randx 6ff0652e9e Admin area -> user form 2012-08-25 20:31:19 +03:00
randx f13bccc14b better flash message style 2012-08-25 19:47:00 +03:00
randx c05692b7b1 scss refactoring 2012-08-25 19:42:34 +03:00
randx fee26c58e2 Move snippets api doc to separate file 2012-08-25 19:21:11 +03:00
Florian Unglaub 36ffdf36b9 Merge issue fixed 2012-08-24 15:40:44 +02:00
Florian Unglaub 48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
randx d5fcf0f672 Show labels specific to project 2012-08-24 15:34:27 +03:00
Dmitriy Zaporozhets 8d65f51e63 Merge pull request #1295 from jouve/fix_mr_form 
fix merge request form
 2012-08-25 06:16:40 -07:00
Joe Hillenbrand 0dbde913dc Hide gravatar tip if gravatar is disabled. 2012-08-24 16:04:07 -07:00
Cyril 2b38f51a17 fix merge request form 2012-08-25 00:22:45 +02:00
randx 3dd7703b80 Feature: Labels page. Index page 2012-08-24 13:05:40 +03:00
Dmitriy Zaporozhets 52f657aa15 Merge pull request #1286 from steveklabnik/master 
Misspelled Draper
 2012-08-24 01:29:52 -07:00
Steve Klabnik f9ab136abd Misspelled Draper 
:)
 2012-08-23 17:01:30 -07:00
Cyril e2f19befbc fix inline forms 2012-08-23 23:04:43 +02:00
Riyad Preukschas 32ae7fb616 Improve GFM code documentation 2012-08-23 20:10:06 +02:00
Dmitriy Zaporozhets 0e5dbd1caf Merge pull request #1231 from NARKOZ/preview_notes 
Preview window is not closed after post
 2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets 7ab587a477 Merge pull request #1263 from dosire/merge_base_for_merge_request 
Show only the commits that are newer in the merge request.
 2012-08-23 00:32:37 -07:00
Dmitriy Zaporozhets 1ef1a4ae6e Merge pull request #1239 from tsigo/disable_gravatar 
Allow disabling Gravatars in gitlab.yml settings
 2012-08-22 04:33:50 -07:00
Dmitriy Zaporozhets aa50408ecb 1. Better message if no ssh key 
2. SSH Keys Help page
 2012-08-22 03:56:53 +03:00
Sytse Sijbrandij 9ec4c2d214 Show only the commits that are newer in the merge request. 2012-08-21 23:07:11 +02:00
randx 3784f134f1 Merge branch 'refactor_notify' of https://github.com/tsigo/gitlabhq into tsigo-refactor_notify 2012-08-21 21:34:33 +03:00
randx f088eaa972 Refactoring & minor css changes 2012-08-21 21:26:56 +03:00
randx 7fa6a23416 Better fonts for all code like wiki etc 2012-08-21 20:53:33 +03:00
randx c625293b99 Handle post-receive files via gitolite, not gitlab 2012-08-21 20:14:06 +03:00
Dmitriy Zaporozhets 2e7ca8c866 Show only tm events related to this project 2012-08-21 08:20:11 +03:00
randx 366c0065c4 Merge branch 'better_ldap' of https://github.com/jirutka/gitlabhq into jirutka-better_ldap 
Conflicts:
	app/models/user.rb
 2012-08-21 08:39:23 +03:00
Robert Speicher c5b13cc989 Remove more duplication in the Notify mailer 2012-08-20 23:18:57 -04:00
Robert Speicher 652d955c92 Remove some duplication in the Notify mailer 2012-08-20 23:04:53 -04:00
randx b2b88b2ff2 Added font for head panel. Major restyle for header 2012-08-20 22:51:37 +03:00
Jakub Jirutka 335b3ed197 fix condition in find_for_ldap_auth 2012-08-20 12:58:03 +02:00
randx d4059ac966 Move graph_commit under gitlab module 2012-08-19 10:58:10 +03:00
randx 8eaead6a01 Text message for mergeing MR 2012-08-19 00:45:46 +03:00
randx 7530fa9dec Restored margin for text in notes 2012-08-19 00:08:20 +03:00
randx 3f9749dd86 Fix branch selector. Few css fixed also 2012-08-18 23:53:58 +03:00
Florian Unglaub a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets 93401ef988 Few css improvements 2012-08-17 09:26:59 +03:00
Dmitriy Zaporozhets 813814f02e Application cleanup 2012-08-17 09:09:11 +03:00
Dmitriy Zaporozhets 4ce034ca65 Merge pull request #1247 from tsigo/feature/no_milestone_filter 
Allow filtering issues that have no milestone or assignee
 2012-08-16 22:33:56 -07:00
Robert Speicher feee3838e1 Combine unassigned_issue and unassigned_milestone into unassigned_filter 2012-08-16 18:13:22 -04:00
Robert Speicher 66399d558d Merge branch 'master' into hooray_apostrophes 2012-08-16 14:03:06 -04:00
Dmitriy Zaporozhets 05da3801f5 Restyled erros pages & avatar class 2012-08-16 09:13:50 +03:00
Robert Speicher 65bcc41f3e Allow disabling Gravatars in gitlab.yml settings 
Closes #1237
 2012-08-15 21:06:08 -04:00
Martin Bastien 6641761e5c Fix current class for hooks tab in admin section 
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
 2012-08-15 00:03:13 -04:00
Robert Speicher 70174a1e1a More minor translation/grammar fixes on error pages 2012-08-14 17:26:38 -04:00
Robert Speicher b039a16946 GFM refactor: Move the actual parsing to a class under the Gitlab module 2012-08-14 04:37:18 -04:00
Robert Speicher e31a9dd253 GFM refactor: Update pattern to avoid an extra HTML entities check 2012-08-14 04:33:46 -04:00
Robert Speicher d1d19aecde GFM refactor: Simplify the regex pattern 
Makes use of 'extended' patterns to add comments to the groups, and also
reduces the total number of groups to just those that are used.
 2012-08-14 04:33:41 -04:00
Nihad Abbasov 0b7e67ad12 fix note preview link, and hide preview and errors after posting a comment 2012-08-14 01:24:27 -07:00
Robert Speicher 6af38f5145 "Cant" -> "Can't" 2012-08-13 21:02:40 -04:00
Robert Speicher 5a90d044f7 Allow filtering by issues with no assigned... assignee 
Continues #1222
 2012-08-13 20:49:18 -04:00
Dmitriy Zaporozhets 6ebd360cf2 Modern theme restyled. Better Profile -> Ui page 2012-08-13 08:52:10 +03:00
Robert Speicher b1ea0b3c01 Allow filtering by issues with no assigned milestone 
Closes #1222
 2012-08-13 01:38:00 -04:00
randx bd0c971aa9 Merge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve-fix_commits_dashboard 
Conflicts:
	app/views/events/_commit.html.haml
 2012-08-12 00:33:32 +03:00
randx 731b6be9c9 Handle app crash on huge commits 2012-08-11 15:59:36 +03:00
Robert Speicher 7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
Cyril 15fc0f0c10 fix commit events on dashboard 2012-08-10 21:23:54 +02:00
Dmitriy Zaporozhets 1413c23c50 Merge pull request #1208 from tsigo/issue_commonality 
Consolidate functionality shared between Issue and MergeRequest
 2012-08-10 06:48:16 -07:00
Dmitriy Zaporozhets 5fd0e7ba11 Merge pull request #1198 from NARKOZ/preview_notes 
ability to preview notes
 2012-08-10 06:42:31 -07:00
Nihad Abbasov 9639780359 render notes preview on server-side 2012-08-09 23:47:48 -07:00
Robert Speicher b7f9b8223e Fix search class method for IssueCommonality 
Also adds specs to the two affected classes that would have caught my
dumb mistake.
 2012-08-09 13:45:12 -04:00
Robert Speicher f36f0dac9d Consolidate functionality shared between Issue and MergeRequest 
Any associations, validations, delegates, scopes and methods that
were exactly the same in both Issue and MergeRequest models have been
moved to a new IssueCommonality module (role) that gets included by each
class.

There was actually quite a bit of duplication, because MergeRequests are
basically just specialized Issues.
 2012-08-08 21:44:33 -04:00
Robert Speicher 7a4c958882 Add empty IssueCommonality module; include in Issue and MergeRequest 2012-08-08 21:26:56 -04:00
Dmitriy Zaporozhets 839757598b Wiki pages page 2012-08-09 07:34:29 +03:00
Dmitriy Zaporozhets 8ffb6126a9 slim comment form 2012-08-09 06:36:55 +03:00
Dmitriy Zaporozhets a76adfa472 Fixed gfm mailer 2012-08-09 06:02:55 +03:00
randx f197fa1fbf Fix github issue #1153 2012-08-08 17:08:43 +03:00
randx 04bad8257f Fixed markdown tests 2012-08-08 11:52:09 +03:00
Nihad Abbasov 1ec3bd3f8d ability to preview notes 2012-08-08 01:12:05 -07:00
Jakub Jirutka ad265b9610 Adding workaround for backward compatibility with legacy LDAP users 2012-08-05 11:27:17 +02:00
randx 6171a4d8eb Fixed dashboard broken messages cause of glm 2012-08-03 03:28:02 +03:00
randx 34ba4e1352 Gitlab Markdown help page 2012-08-03 00:20:09 +03:00
Riyad Preukschas 5443021a0e Update notifications mails and notify specs for GFM 2012-08-06 05:08:22 +02:00
Riyad Preukschas 9a0b763eec Fix missing @project errors 2012-08-06 03:16:06 +02:00
Riyad Preukschas 6f9428b1cd Fix GFM helper to raise an exception when @project is not set 2012-08-06 02:32:17 +02:00
Riyad Preukschas 8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
Valeriy Sizov 1c60c3d73d Merge pull request #1147 from miks/master 
Add automatic HTML id attributes to markdown headings to allow linking to content sections in wiki
 2012-08-04 10:30:05 -07:00
Valeriy Sizov c757924902 Merge pull request #1184 from karuna/master 
Hook url should be able to contain http basic authentication
 2012-08-04 10:17:14 -07:00
randx 7dd276817c Rack mini profiler for dev env 2012-08-02 09:48:53 +03:00