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

2854 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robert Speicher
39c6579306 Add BlameController, remove Refs#blame action 2012-09-26 16:32:22 -04:00
Robert Speicher
37f0b600bc Another RefExtractor refactor 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
884eb73297 Enable tree resource, remove old tree routes 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
567767bcf2 Add ref_extractor helper module for upcoming controllers 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
a21abce94f Add tree-ish route placeholders, modify commit(s) routes 2012-09-26 16:32:20 -04:00
Robert Speicher
bde5088525 Add routing specs for new routes 2012-09-26 16:32:20 -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
Dmitriy Zaporozhets
0439387be0 Merge pull request #1567 from NARKOZ/mass-assignment 
set activerecord whitelist_attributes to true [2]
 2012-09-26 13:05:55 -07:00
Nihad Abbasov
83efcabc82 set activerecord whitelist_attributes to true 2012-09-26 11:18:35 -07:00
Nihad Abbasov
4629cc44d6 fix mass assignment error in create_from_omniauth after a6a229a 2012-09-26 11:18:25 -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
Marin Jankovski
a58d311262 Secure and httponly options on cookie. 2012-09-26 16:02:31 +02:00
Alex Denisov
965b6701ab Comment removed 2012-09-26 17:01:13 +03: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
Dmitriy Zaporozhets
547be97ba6 Merge pull request #1560 from NARKOZ/refactoring 
cleanup rake tasks
 2012-09-26 04:21:32 -07:00
Marin Jankovski
5928388b1c Protect users projects_limit from mass assignment. 2012-09-26 13:20:44 +02:00
Nihad Abbasov
83696b127b cleanup rake tasks 2012-09-26 04:18:10 -07: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
Dmitriy Zaporozhets
2cc8d91dad Merge pull request #1551 from NARKOZ/front-end 
add auto-completion for +1, -1 emoji
 2012-09-25 10:12:32 -07:00
Marin Jankovski
7284c58c5f Don't test if invalid key is valid. 2012-09-25 16:13:24 +02:00
Marin Jankovski
012dc2278c Valid key for deploy keys spec test. 2012-09-25 16:13:13 +02:00
Marin Jankovski
81ffb0afdd Add valid looking key to test. 
Conflicts:

	features/steps/profile/profile_ssh_keys.rb
 2012-09-25 14:11:31 +02: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
Nihad Abbasov
c3907bef59 Merge pull request #1501 from caleywoods/master 
Update timeout comment in unicorn example config.
 2012-09-24 09:05:09 -07: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
Dmitriy Zaporozhets
a6f58b9c43 Up to v2.9.1 2012-09-24 10:45:55 +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