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
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
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
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
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
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
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
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
Dmitriy Zaporozhets
61c7449321
Bulk user add on project -> new team member
2012-09-07 09:50:35 +03: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
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
Dmitriy Zaporozhets
982a4095c1
Use tw style for some buttons. Improved deploy key UI
2012-09-05 08:56:59 +03: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
7e76610d0a
Update the projects js file to coffeescript; refactor the clone panel switcher
2012-09-04 12:05:20 -04: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
b44e9a08d5
Add Milestone link to API help TOC
...
[ci skip]
2012-09-03 20:38:41 -04:00
randx
f557686eb2
git clone panel available on files tab too
2012-09-03 22:30:14 +03:00
randx
8ca0b75d05
Tables refactored
2012-09-03 21:53:16 +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
randx
beb5e1bd6b
Sanitize glm helper
2012-09-01 23:35:04 +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
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
Dmitriy Zaporozhets
cd3d50caf2
Changed colors for buttons. Imporved preview area. Added clone panel to empty project
2012-08-30 09:27:02 +03:00