Commit graph

3747 commits

Author SHA1 Message Date
Riyad Preukschas
534bd5a268 Fix emoji generation and styling 2012-12-03 22:51:56 +01:00
Riyad Preukschas
bd60a4ed40 Make notes JS know which notes are new in a request 2012-12-03 22:51:56 +01:00
Riyad Preukschas
ae067ee322 Fix vote counting 2012-12-03 22:51:56 +01:00
Riyad Preukschas
6c6f415cae Fix appending diff line notes 2012-12-03 22:51:55 +01:00
Riyad Preukschas
5c2f6d7f05 Update notes views to support discussions 2012-12-03 22:51:55 +01:00
Riyad Preukschas
0b3df2f128 Add merge request note feature 2012-12-03 22:51:55 +01:00
Riyad Preukschas
7971383d53 Rename the "Comments" tab for merge requests "Discussion" 2012-12-03 22:51:55 +01:00
Riyad Preukschas
a048c955fd Add JS behaviors 2012-12-03 22:51:55 +01:00
Riyad Preukschas
a58385247d Add discussions for merge requests to notes controller 2012-12-03 22:51:55 +01:00
Riyad Preukschas
9b919939a3 Fix parameter passing and wording for per line notes 2012-12-03 22:51:55 +01:00
Riyad Preukschas
b91d680257 Fix notes helper 2012-12-03 22:51:55 +01:00
Riyad Preukschas
fc1c250d40 Reorder Note methods and add helpers 2012-12-03 22:51:55 +01:00
Dmitriy Zaporozhets
63dac843fd Merge pull request #2149 from jojosch/help-rake-tasks
add help page for gitlab specific rake tasks
2012-12-03 09:07:37 -08:00
Johannes Schleifenbaum
fddc0c29aa add help page for gitlab specific rake tasks 2012-12-03 17:19:33 +01:00
Dmitriy Zaporozhets
7b97e30449 More indices for asscociations. related to #2159 2012-12-03 18:11:47 +02:00
Dmitriy Zaporozhets
8dec24a33c Event indices related to #2159 2012-12-03 17:50:33 +02:00
Dmitriy Zaporozhets
05820516f1 Remove annoying failing spec 2012-12-03 17:38:35 +02:00
Dmitriy Zaporozhets
a5105ddf13 Fix broken CSS 2012-12-03 14:39:13 +02:00
Dmitriy Zaporozhets
6ea6ab7c8d Restyled services page in order to make it more usable 2012-12-02 08:41:06 +03:00
Dmitriy Zaporozhets
c0c5d94b2b Merge pull request #2177 from riyad/update-pygments.rb
Update pygments.rb
2012-12-05 02:45:22 -08:00
Riyad Preukschas
2519fd8376 Update pygments.rb
Fixes #1774
2012-12-05 02:14:08 +01:00
Riyad Preukschas
005f2eb9f0 Merge pull request #2176 from koenpunt/gh-issue-1612
Fix for #1612 `overflow: auto` so content won't break layout
2012-12-04 16:40:08 -08:00
Koen Punt
61140b71cd overflow: auto so content won't break layout #1612 2012-12-05 01:22:30 +01:00
Dmitriy Zaporozhets
e376f31507 Admin can move project to ANY namespace. Updated permissions page 2012-12-04 22:48:24 +02:00
Dmitriy Zaporozhets
2a1c5cdf99 Only owner of current namespace can change project namespace 2012-12-04 22:06:55 +02:00
Riyad Preukschas
f6bfa095bf Merge pull request #2172 from skarphet/patch-1
Devise locale updated to stay consistent with GitLab
2012-12-04 11:17:56 -08:00
skarphet
107a4e386a Devise locale updated to stay consistent with GitLab 2012-12-04 19:19:26 +01:00
Dmitriy Zaporozhets
9acd7cf1bd Show namespaces when adding projects to user in admin area 2012-12-04 15:26:12 +02:00
Dmitriy Zaporozhets
d8398921eb Dont allow select block user as new team member 2012-12-04 15:22:22 +02:00
Dmitriy Zaporozhets
ba74fa1413 Remove some bugs. Add warnings for renaming group. Add ability to cahnge group owner. 2012-12-03 21:14:05 +03:00
Dmitriy Zaporozhets
7f6bbf06f8 Fix bug getting started message when navigate to personal projects w/o them exist 2012-12-04 11:18:41 +02:00
Nihad Abbasov
87e0429fb1 update link to travis-ci 2012-12-04 12:39:09 +04:00
Dmitriy Zaporozhets
f2a76228f2 Remove unsued css styles. Fixed Milestone preselected date. 2012-12-01 09:14:05 +03:00
Dmitriy Zaporozhets
2d076394aa Fix github issue #967 2012-12-03 13:22:28 +02:00
Dmitriy Zaporozhets
0530e5baae Add description to project features on edit project page 2012-12-02 19:28:23 +02:00
Dmitriy Zaporozhets
e117414e44 Merge pull request #2124 from NARKOZ/api
remove unnecessary API::VERSION constant
2012-12-02 03:30:30 -08:00
Dmitriy Zaporozhets
46bf3a0949 Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00
Dmitriy Zaporozhets
2be5e6d443 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-12-02 12:18:48 +02:00
Dmitriy Zaporozhets
f2e1c8b709 Merge pull request #2138 from jouve/refactor_flash
refactor flash
2012-12-02 02:18:34 -08:00
Valeriy Sizov
1dfbce20d1 Merge pull request #2148 from jojosch/fix-2147
commit diff - check if prev_commit is not nil
2012-12-01 14:02:53 -08:00
Johannes Schleifenbaum
0323610b72 commit diff - check if prev_commit is not nil 2012-12-01 19:31:39 +01:00
Dmitriy Zaporozhets
e9212b0aa2 Merge pull request #2141 from NARKOZ/notes-text-limit
remove length limit from notes
2012-12-01 10:30:10 -08:00
Cyril
a9a5497915 refactor flash
* make unobtrusive js
* convert js to coffee
2012-12-01 18:40:47 +01:00
Nihad Abbasov
24e172597a remove length limit from notes 2012-12-01 03:19:16 -08:00
Nihad Abbasov
270a43370a API: get a single wall note 2012-12-01 02:20:45 -08:00
Nihad Abbasov
b17e94c37b update contents of API README 2012-12-01 02:07:57 -08:00
Nihad Abbasov
42ef89c98a API: expose created date for project hooks and user SSH keys 2012-12-01 02:04:44 -08:00
Nihad Abbasov
968c09ae91 API version returns last version set
* fixed in grape v0.2.2
2012-12-01 02:03:51 -08:00
Dmitriy Zaporozhets
35f0566e08 gitlab meta to 4.0 2012-11-30 23:08:08 +02:00
Dmitriy Zaporozhets
c177593e2c Merge pull request #2059 from dolanor/feature-rewording-blocked-users
Rewording for the account being blocked
2012-11-30 12:50:06 -08:00