Robert Hopson
32be082055
Update app/views/notify/new_merge_request_email.html.haml
...
Fix spelling of 'assignee'
2012-12-28 10:56:48 -08:00
Chris Frohoff
21e55ca318
added RAILS_RELATIVE_URL_ROOT support
2012-12-28 18:11:28 +00:00
Dmitriy Zaporozhets
e9394c48ca
Fix dir_exists?
2012-12-28 06:24:05 +03:00
Dmitriy Zaporozhets
d03964d6ec
Fixed and improved enable_naamespace migration task
2012-12-28 06:14:05 +03:00
Dmitriy Zaporozhets
1f3bdd453e
Allow spaces in project name
2012-12-28 09:29:57 +02:00
Dmitriy Zaporozhets
3de4271846
Merge branch 'feature/add_user_to_projects_in_group-2298' of https://github.com/zzet/gitlabhq into zzet-feature/add_user_to_projects_in_group-2298
2012-12-28 09:14:28 +02:00
Dmitriy Zaporozhets
4cbb29cfad
Fix not_in_project scope. Added counters in admin -> users. Improved seeds
2012-12-27 06:14:05 +03:00
Andrey Kumanyaev
c8bf5905bf
Fix form url and routes path
2012-12-26 20:31:18 +04:00
Andrey Kumanyaev
98044f0f14
Code duplication removed from controllers
2012-12-26 20:30:11 +04:00
Andrey Kumanyaev
39e7a0eafe
Rewrite rendering rows with users projects access in Users table in Admin group section
2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
634783feb0
Rename scope "in_group" to "in_namespace"
2012-12-26 19:52:16 +04:00
Andrey Kumanyaev
1e3d238910
Replace short loop variable from "p" to "project"
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
2753cea75a
Add variable form in user section
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
25c5763780
Add functional in user section
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
9c574464a6
Add functional in admin section
2012-12-26 19:52:15 +04:00
Andrey Kumanyaev
17ea019f4e
Add Project name validation
2012-12-26 19:52:15 +04:00
Dmitriy Zaporozhets
c8ba5c2d58
Fix routing issues when navigating over tree, commits etc
2012-12-25 06:14:05 +03:00
Dmitriy Zaporozhets
6570843f84
Fix MR count for group scope
2012-12-24 21:27:12 +02:00
Dmitriy Zaporozhets
4ba24596d3
Make the logo icon more awesome
2012-12-24 21:18:23 +02:00
Dmitriy Zaporozhets
a87fccc083
Update projects in gitolite after namespace moved. Added rake task to cleanup garbage from gitolite
2012-12-24 20:02:08 +02:00
Dmitriy Zaporozhets
c49a3106ff
Merge pull request #2350 from Razer6/milestone-expiration-date
...
Changed wording if milestone already expired
2012-12-24 05:58:28 -08:00
Dmitriy Zaporozhets
efc4cae1b7
Add License
2012-12-24 14:33:16 +02:00
Dmitriy Zaporozhets
2937f35f9a
Replace Wire font with Yanone. Show only icon as link to dashboard
2012-12-24 14:24:45 +02:00
Dmitriy Zaporozhets
d80d4cd92b
Replace font with free one
2012-12-24 12:37:28 +02:00
Robert Schilling
d62a8a4d50
Changed wording if milestone already expired, using Date#past
2012-12-23 21:16:51 +00:00
Dmitriy Zaporozhets
25c33ca3d0
Fix webhook data sample
2012-12-23 01:14:04 +02:00
Dmitriy Zaporozhets
3ff131a747
Improve web hook data. Use clonable url in repo info
2012-12-23 01:10:57 +02:00
Dmitriy Zaporozhets
86ed2e8f17
Fixed MR count on dashboard
2012-12-23 00:39:42 +02:00
Riyad Preukschas
5d1044c335
Fix Commit#to_diff
2012-12-22 20:36:33 +01:00
Dmitriy Zaporozhets
1ba28aaef8
Implement UsersProject project_access validation
2012-12-22 19:52:28 +02:00
Dmitriy Zaporozhets
cec866a7ce
Improve wiki rendering. Fix pygemnt + markdown invalid html
2012-12-22 13:01:15 +02:00
Dmitriy Zaporozhets
a7b572d0ab
Fixed #2333
2012-12-22 11:59:05 +02:00
Dmitriy Zaporozhets
8fe58ed541
Merge pull request #2330 from gitlabhq/v4.0-api-fixes
...
V4.0 API fixes
2012-12-22 00:43:17 -08:00
Dmitriy Zaporozhets
86673a66b7
Fix fark background highlight
2012-12-21 23:22:52 +02:00
Riyad Preukschas
eaa99478a7
Up API version to v3
2012-12-21 18:55:39 +01:00
Dmitriy Zaporozhets
a47032bc29
Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509
...
Conflicts:
vendor/assets/javascripts/branch-graph.js
2012-12-21 13:07:34 +02:00
Dmitriy Zaporozhets
a567d596f8
Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
...
Fix and refactoring gfm_autocomplete
2012-12-21 02:47:55 -08:00
Riyad Preukschas
0efc903eef
Fix text in project move mail
2012-12-20 22:25:42 +01:00
Dmitriy Zaporozhets
2a3f5dae0f
Fix email send on close/reopen issue. Display project name with namespace. remove css style
2012-12-20 23:04:27 +02:00
Dmitriy Zaporozhets
75dd704294
Send update instructions after project namespace id changed or namespace path changed
2012-12-20 22:16:51 +02:00
Dmitriy Zaporozhets
d188adfd97
Changelog updated. Added warnings to username form
2012-12-20 21:16:42 +02:00
Valeriy Sizov
77d632890b
refactoring gfm_autocomplete
2012-12-20 20:52:12 +02:00
Riyad Preukschas
757c7a5291
Fix gravatar and ldap config
2012-12-20 16:54:28 +01:00
Riyad Preukschas
19eb637419
Update uses of Gitolite.config.foo settings
2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets
9bc315bb25
Merge pull request #2211 from jojosch/fix-dark-code-preview
...
fix dark code preview background when displaying long lines
2012-12-20 07:46:59 -08:00
Dmitriy Zaporozhets
b772c2c3f0
Fix issue update.js
2012-12-20 16:42:13 +02:00
Dmitriy Zaporozhets
a7aee9d1ee
Pretty compare mode
2012-12-19 20:14:05 +03:00
Dmitriy Zaporozhets
40c6d87175
Merge pull request #2315 from koenpunt/gh-issue-513
...
Added compare switch
2012-12-20 06:15:39 -08:00
Koen Punt
b2e31692a5
Added icon
2012-12-20 14:58:07 +01:00
Koen Punt
d11f9a632c
only show switch if from and to are set
2012-12-20 14:42:05 +01:00
Koen Punt
9916e8d6dc
Updated test to match with switched commits
...
Added compare switch
2012-12-20 14:39:39 +01:00
Koen Punt
6d93eafa6a
disabled sorting of commits before compare
2012-12-20 13:50:43 +01:00
Koen Punt
a09d938215
Flipping commit ids in commits_between, fixes #513
2012-12-20 13:31:09 +01:00
Dmitriy Zaporozhets
4b02f4a22d
show production.log, show only active milestone for issue filter
2012-12-19 07:14:05 +03:00
Dmitriy Zaporozhets
e9c6d4adfa
Merge branch 'refactor_issues' of dev.gitlabhq.com:gitlab/gitlabhq
2012-12-20 13:50:42 +00:00
Dmitriy Zaporozhets
adb17d6052
Cleanup after issues refactor and fix test
2012-12-20 15:39:54 +02:00
Dmitriy Zaporozhets
2f7effe804
Refactor issues, Remove ajax
2012-12-19 06:14:05 +03:00
Dmitriy Zaporozhets
8826077471
Refactor css lists. Use well-list class
2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets
85d5f606f6
Labels autocomplete
2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets
2b921a6c72
Few icons for services list
2012-12-20 11:52:42 +02:00
Dmitriy Zaporozhets
9b57bf7811
Remove main. Use application.scss instead
2012-12-19 20:57:41 +02:00
Dmitriy Zaporozhets
965102b3f6
Move mixins and variables under gitlab bootstrap
2012-12-19 19:02:12 +02:00
Dmitriy Zaporozhets
52fbcd45a4
Better organization of styles
2012-12-19 18:34:24 +02:00
Dmitriy Zaporozhets
9ada678819
Split commit_id and noteable_id for Note
2012-12-18 20:02:00 +02:00
Dmitriy Zaporozhets
f4a6f1fd5a
Fix admin paging gap issue
2012-12-17 15:57:10 +02:00
Dmitriy Zaporozhets
5058c4fdcf
Fix wall notes event trying to render target
2012-12-16 19:52:39 +02:00
Dmitriy Zaporozhets
26afde94fd
Merge pull request #2250 from jouve/fix_missing_tr_in_thead
...
add missing mandatory tr in thead
2012-12-16 08:16:42 -08:00
Dmitriy Zaporozhets
45e208cb19
Merge pull request #2287 from Partugal/patch-add-more-restricts-to-project-name
...
added more denied project names
2012-12-16 08:15:57 -08:00
Johannes Schleifenbaum
d3b3810928
fix dark code preview background when displaying long lines
2012-12-15 11:44:30 +01:00
Sergey Linnik
f7e934696c
added more denied project names
2012-12-15 14:33:45 +04:00
Dmitriy Zaporozhets
0f7d3f591c
Moving repositories spec to roles. Added missing spec for project
2012-12-15 12:32:09 +02:00
Riyad Preukschas
d2be7577c1
Merge pull request #2243 from jouve/fix_gfm_username_autocomplete
...
fix gfm autocomplete for usernames
2012-12-14 13:56:06 -08:00
Dmitriy Zaporozhets
b79e00881e
Uncommented test observing comment event
2012-12-14 22:05:10 +02:00
Dmitriy Zaporozhets
0ff468160e
Fixed event.allowed? with event.proper?
2012-12-14 21:54:49 +02:00
Dmitriy Zaporozhets
f03dc8716d
Fix author_id_of_changes mass assignment
2012-12-14 21:48:16 +02:00
Dmitriy Zaporozhets
f2db188dbe
Processing with note events. reformated dashboard for more events to handle
2012-12-14 21:39:55 +02:00
Dmitriy Zaporozhets
678e5355a3
Create events on comments and milestone
2012-12-14 19:33:33 +02:00
Dmitriy Zaporozhets
190e483fb4
Rework of milestones
2012-12-14 08:34:05 +03:00
Dmitriy Zaporozhets
b01f8b63c2
added NamespacedProject role. Extended project info displayed for admin. Fixed project limit
2012-12-14 08:14:05 +03:00
Dmitriy Zaporozhets
44209861e8
Allow group path renaming. Dont show project transfer if no permissions. More danger messages :)
2012-12-14 06:14:05 +03:00
Dmitriy Zaporozhets
a8fbda945e
bit reordering and cleanup unused styles
2012-12-13 21:44:55 +02:00
Dmitriy Zaporozhets
1d156c9c8e
Fix project lookup. Show error if project transfer fails
2012-12-13 19:20:37 +02:00
Dmitriy Zaporozhets
03369a9165
Use one helper for linking to team member. More clear title for Issue and MR
2012-12-13 06:14:05 +03:00
Cyril
a5861b8ff3
fix gfm autocomplete for usernames
2012-12-13 01:44:25 +01:00
Valeriy Sizov
b48852e789
Merge pull request #2261 from jouve/fix_user_validation
...
Validates presence of User#name
2012-12-12 09:47:56 -08:00
Dmitriy Zaporozhets
bca7bddd3d
Add ace editor to snippets
2012-12-12 19:42:08 +02:00
Cyril
63d9373aa8
Validates presence of User#name
...
The 2 reasons are :
- creation of user fail if name is empty : in after_save, it tries to create a
namespace with namespace.name = user.name and namespece validates presence
Namespace#name
- in the web app links to team members are broken with empty User#name because
they are of the form <a href'...'> user.name </a>
2012-12-12 17:53:43 +01:00
Dmitriy Zaporozhets
273c0d2aa3
Merge pull request #2253 from alexleutgoeb/patch-1
...
Minor: Change html input type to "email" on sign-in view
2012-12-12 04:17:14 -08:00
Dmitriy Zaporozhets
439d03bbed
Fix namespace api autocomplete
2012-12-12 12:54:28 +02:00
Dmitriy Zaporozhets
105f5ba3c9
Reduce header font a bit. Moved to mixin header font styles
2012-12-12 12:30:19 +02:00
Dmitriy Zaporozhets
d7eb314553
Project titles with namespaces
2012-12-12 12:02:29 +02:00
Dmitriy Zaporozhets
743073ce5f
pretty gl icon for dark themes. Removed old gl icons
2012-12-11 21:11:29 +02:00
Dmitriy Zaporozhets
7f636b1306
Fix project namespaces for web hooks data
2012-12-11 19:16:56 +02:00
Alex Leutgöb
f2bf05066d
Add autofocus attribute to sign-in email field
2012-12-11 11:57:25 +01:00
Alex Leutgöb
8738eb2369
Change html input type to "email" on sign-in view
...
As long as the username is the user's email address it makes sense to use input="email" helper for the email field. This allows HTML5 capable (mobile) devices to bring up an email input keyboard instead of the default one.
2012-12-11 11:25:55 +01:00
Dmitriy Zaporozhets
5d219bd5f0
Fix gitolite error instructions
2012-12-11 09:22:14 +02:00
Dmitriy Zaporozhets
ca936d2784
Improve CI integration for merge requests
2012-12-11 06:14:05 +03:00
Cyril
c76764b7dc
add missing mandatory tr in thead
2012-12-11 02:39:05 +01:00
Cyril
7d3ee2baa6
add username to team_member page
2012-12-11 02:17:09 +01:00
Riyad Preukschas
a5243178ed
Fix commit url in PushObserver#post_receive_data
...
Fixes #2246
2012-12-10 20:28:18 +01:00