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