Commit Graph
3877 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets e6afbff4c2 Merge pull request #5640 from carlosparamio/assembla_service
Integration with Assembla
2013-11-23 02:20:32 -08:00
Judson D Neer 574fffb722 Fix grammar in fork error message. 2013-11-21 11:53:48 -08:00
Carlos Paramio 4db87f7c4b Integration with Assembla 2013-11-21 13:18:02 +01:00
Dmitriy Zaporozhets fc3c57734d Style resend confirmation instructions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-21 09:46:09 +02:00
Dmitriy Zaporozhets 3bdf930852 Render markdown in snippets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 17:29:50 +02:00
Dmitriy Zaporozhets 436e96467d Nicer icons for enabled/disabled stuff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 14:05:42 +02:00
Dmitriy Zaporozhets b07c02eb13 Add more info to admin dashboard
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 13:41:41 +02:00
Dmitriy Zaporozhets 8ddb064bbd Prefer user email match when looking for commit author
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 11:19:51 +02:00
Dmitriy Zaporozhets 30912835e3 Correctly remove and re-create satellites when project transfer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 11:06:42 +02:00
Dmitriy Zaporozhets 3bab1bd4c1 Improve consistency: use file_path for API create/update/delete files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-20 10:03:50 +02:00
Dmitriy Zaporozhets bd20ec1a34 Remove file from repository feature
After click on remove file button you will be asked for commit message
via modal window. After submitting modal form file will be removed from
repository

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 16:14:56 +02:00
Dmitriy Zaporozhets 4cac195a0e DeleteFile context
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-19 16:14:06 +02:00
Dmitriy Zaporozhets 8841eec426 Improve snippets UX
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-18 21:34:07 +02:00
Dmitriy Zaporozhets c938833bd9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-11-15 16:20:00 +02:00
Dmitriy Zaporozhets 0815098d3a Admin can transfer project to any namespace
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-15 15:25:37 +02:00
Dmitriy Zaporozhets dcea191314 Select2 tag for namespaces with ajax loading
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-15 15:25:09 +02:00
Dmitriy Zaporozhets adb58e36ba Merge pull request #5557 from dpursehouse/merge-status-message-improvement
Improve status message on merge request page
2013-11-15 03:55:18 -08:00
Dmitriy Zaporozhets a7d3e2b9b6 Fix recent branches order. Added counters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-15 09:18:06 +02:00
Dmitriy Zaporozhets eed8abf89a Merge branch 'broadcast-wording' of /home/git/repositories/gitlab/gitlabhq 2013-11-15 07:05:01 +00:00
Sytse Sijbrandij 6156cacbe9 Improve formulation of the sentence. 2013-11-14 13:50:07 -05:00
Dmitriy Zaporozhets 42d9400e5a Improve markdwon typography
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-14 20:14:07 +02:00
Dmitriy Zaporozhets f51c21b671 Minor ui fixes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-14 17:57:09 +02:00
Dmitriy Zaporozhets 9fbbae9dbf Small css cleanup
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-14 17:23:31 +02:00
Dmitriy Zaporozhets 7d037c111b Refactor Chosen.js select css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-14 17:01:23 +02:00
Dmitriy Zaporozhets c946defb3d Restyle ui-box to be more flat
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 17:56:14 +02:00
Dmitriy Zaporozhets 9fbe3ac771 Nicer ui-box-danger
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 17:39:04 +02:00
Dmitriy Zaporozhets aed65f56ec New style for buttons (bootstrap 3 like)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 17:35:44 +02:00
Dmitriy Zaporozhets 37741f3eb8 Fix small select width for trasnfer project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 17:06:24 +02:00
Dmitriy Zaporozhets 64edb27aa9 Extend Gitlab#default_regex. Dont allow project path ends with .git
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 16:13:40 +02:00
Dmitriy Zaporozhets 31239d116a Add additional validation to push event
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:21:03 +02:00
Dmitriy Zaporozhets 467e4e81f4 Dont show last push widget if user removed this branch
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:17:03 +02:00
Dmitriy Zaporozhets 201d489780 Annotate
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 14:10:03 +02:00
Dmitriy Zaporozhets c727fdd054 Group head titles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 10:35:10 +02:00
Dmitriy Zaporozhets e51411ecc7 Correct head titles for project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 10:28:15 +02:00
Dmitriy Zaporozhets 02448fce1e Improve default theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 09:20:36 +02:00
Dmitriy Zaporozhets 672cd9b0d9 Improve Charcoal theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 09:12:22 +02:00
Dmitriy Zaporozhets 929a296920 Improve violet theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 09:08:03 +02:00
Dmitriy Zaporozhets f597b5f43a Fix logo overflow when broadcast message displayed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 09:03:11 +02:00
Dmitriy Zaporozhets cb6639ffbb Improve chosen selectbox style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-13 08:06:58 +02:00
Dmitriy Zaporozhets d89c6adfe6 Improve select UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 22:32:28 +02:00
Dmitriy Zaporozhets bd2ca33d58 Merge branch 'relative' of /home/git/repositories/gitlab/gitlabhq 2013-11-12 18:14:44 +00:00
Dmitriy Zaporozhets 13a6604030 Ability to remvoe broadcast messages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 15:20:31 +02:00
Dmitriy Zaporozhets c5b667351a Show broadcast message to users
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 15:08:20 +02:00
Dmitriy Zaporozhets 90d599397f Add broadcast messages to admin nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 14:29:43 +02:00
Dmitriy Zaporozhets dd501aa7a7 Broadcast messages scaffold in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 14:28:12 +02:00
Dmitriy Zaporozhets f1ecf53c1e Broadcast message model + migrations
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 13:47:28 +02:00
Dmitriy Zaporozhets 0a08c77519 Improve UX for project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 12:56:20 +02:00
David Pursehouse dfb8d2b7ff Improve status message on merge request page
The status message currently looks like:

  Created on Oct 24, 2013 by John , currently assigned to Bob

There is a space between the author name and the comma, which is
incorrect.  Also, there is no period at the end of the sentence,
which makes it inconsistent with the following line:

  Merged by Bob 5 minutes ago.

Change it to:

  Created on Oct 24, 2013 by John.  Currently assigned to Bob.

Also change the milestone information from:

  and attached to milestone XYZ

to:

  Attached to milestone XYZ.
2013-11-12 18:24:03 +09:00
Dmitriy Zaporozhets 00d6ac299e Fix no-ssh-key-message path for cookie
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 10:36:09 +02:00
Marin Jankovski e16eb91299 Merge branch 'master' into relative 2013-11-12 09:26:17 +01:00