Dmitriy Zaporozhets
d7c5885c3d
Improved Issues and MR filters
2012-11-27 07:29:11 +03:00
Cyril
b382ce4d91
fix destroy project from admin
2012-11-26 01:22:44 +01:00
Dmitriy Zaporozhets
1d857aae17
project admin area - show project name with namespace
2012-11-25 18:52:12 +02:00
Dmitriy Zaporozhets
97a92f8ae7
Fixed user.namespace_id exception if namespace is nil
2012-11-25 12:26:34 +02:00
Dmitriy Zaporozhets
c31d48dd25
Allow project creation in scope of group for non-admin but group owners
2012-11-25 11:57:01 +02:00
Dmitriy Zaporozhets
2f22874ba6
Fix group assoc. Show namespace in project list
2012-11-24 22:39:51 +02:00
Dmitriy Zaporozhets
65c470e843
Reannotated
2012-11-24 22:16:51 +02:00
Dmitriy Zaporozhets
3f1d6d6ab3
move namespace dir after path changed
2012-11-24 22:11:46 +02:00
Dmitriy Zaporozhets
f37fa968b2
add ability to change namespace from project edit page
2012-11-24 22:00:30 +02:00
Dmitriy Zaporozhets
f997947664
Project can be transfered to namespace and out now
2012-11-24 12:37:30 +02:00
Dmitriy Zaporozhets
d405c8fc60
Create namespace on username init. Raise exception if project cannot be moved
2012-11-24 12:25:04 +02:00
Dmitriy Zaporozhets
4023d9f852
class for moving project
2012-11-24 11:46:19 +02:00
Dmitriy Zaporozhets
0e1635a68a
Fixing requests after namespaces. Fixed admin bug with access to project
2012-11-23 22:25:28 +02:00
Dmitriy Zaporozhets
9304d049de
Fixed some tests and snippet colorize
2012-11-23 22:31:09 +03:00
Dmitriy Zaporozhets
470aa7675e
Fix project.code-related functionality
2012-11-23 21:31:09 +03:00
Dmitriy Zaporozhets
c50ec72b52
Deprecate code for Project. Use title and path
2012-11-23 21:11:09 +03:00
Dmitriy Zaporozhets
ab9d023651
Create dir with namespace. Create namespace with user
2012-11-23 09:11:09 +03:00
Dmitriy Zaporozhets
f17ddeb394
Make admin project list more useful
2012-11-23 07:24:09 +03:00
Dmitriy Zaporozhets
552b3105fb
Fixed admin area. Create project only from one place
2012-11-23 07:31:09 +03:00
Dmitriy Zaporozhets
2b683b0d0b
Ability to create project with namespace
2012-11-23 07:11:09 +03:00
Dmitriy Zaporozhets
96105e214f
Update namespace if user changed username. Dont move project if new record
2012-11-23 06:39:09 +03:00
Dmitriy Zaporozhets
26622f4c8f
Improve routing. Project access via namespace
2012-11-22 23:34:06 +03:00
Dmitriy Zaporozhets
71214bee75
Move directory with project. Fixed all related path methods to use namespace
2012-11-22 22:41:26 +03:00
Dmitriy Zaporozhets
e29ccece33
Namespace model added. Migration to convert exit project/groups
2012-11-22 21:34:26 +03:00
Dmitriy Zaporozhets
ab42370af0
Fix sattellites
2012-11-21 09:14:05 +03:00
Dmitriy Zaporozhets
23734a715e
Dashboard filters for events
2012-11-21 08:24:05 +03:00
Dmitriy Zaporozhets
899afd0067
Fix snippet render issue cause of haml preserve
2012-11-26 07:14:05 +03:00
Dmitriy Zaporozhets
29636d4dab
Fix snippet render error
2012-11-26 06:14:05 +03:00
Dmitriy Zaporozhets
e750efd9fc
Merge pull request #2067 from riyad/diff-and-patch-for-commits-and-merge-requests
...
Diff and patch for commits and merge requests
2012-11-26 04:40:49 -08:00
Dmitriy Zaporozhets
2d5a6fc850
Fix dir permission on creation
2012-11-26 13:07:16 +02:00
Dmitriy Zaporozhets
7ae851f642
Fix critical issue with dir permission for namespaces
2012-11-26 12:43:32 +02:00
Dmitriy Zaporozhets
585eb70588
Fix http push with namespaces. Allow use of username as login
2012-11-26 11:23:08 +02:00
Riyad Preukschas
79a4ed15ce
Change "Get Patch" buttons to dropdowns orffering patches and diffs
2012-11-25 00:36:19 +01:00
Riyad Preukschas
b3834bc9b0
Remove MergeRequest#to_raw and replace it with #to_diff and #to_patch
2012-11-25 00:05:47 +01:00
Riyad Preukschas
2b1afa0e62
Remove merge_request#raw and replace it with formats to #show
...
Needed to add a constraint on the id. Otherwise the format was parsed as part of the id.
2012-11-25 00:05:44 +01:00
Riyad Preukschas
3b7c2adf0a
Add diff format to commit#show
2012-11-22 20:49:44 +01:00
Riyad Preukschas
246faa3d7a
Add Commit#to_diff for raw diff
2012-11-22 20:49:01 +01:00
Riyad Preukschas
6ddf4567f4
Don't escape Html in patches
...
Fixes #2036
2012-11-22 12:45:39 +01:00
Dmitriy Zaporozhets
0046409970
I prefer icons on header
2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets
6bf656970d
Use fieldset. Improved profile
2012-11-21 08:14:05 +03:00
Dmitriy Zaporozhets
f614ae8ef7
Increased test coverage
2012-11-21 07:14:05 +03:00
Dmitriy Zaporozhets
47234ab367
Validate username. Gitlab::Regex added
2012-11-28 06:14:05 +03:00
Dmitriy Zaporozhets
d18e2bd59d
styled error message
2012-11-21 06:14:05 +03:00
Dmitriy Zaporozhets
c1c1a1eeee
Restored old h6 of bootstrap. Fixed buttons line-height
2012-11-21 09:14:15 +02:00
Dmitriy Zaporozhets
ec7a1c504f
Fix tabs line height
2012-11-21 00:18:36 +02:00
Dmitriy Zaporozhets
dc9916b474
Merge pull request #1998 from erroric/gitlabhq_issue1669
...
fix for issue #1669
2012-11-20 14:10:45 -08:00
Dmitriy Zaporozhets
4d846c09b1
Fixed spec
2012-11-20 23:18:44 +02:00
Dmitriy Zaporozhets
942c410119
Implemented bootstrap 2.2.1.1. Restyled header panel
2012-11-20 23:05:15 +02:00
Dmitriy Zaporozhets
236584c2f8
update bootstrap to 2.2.1.1
2012-11-20 20:01:25 +02:00
Dmitriy Zaporozhets
ebcbe0c87b
Add status badge for MR
2012-11-20 20:34:05 +03:00
Dmitriy Zaporozhets
ed92cfdebd
Fix method call for service hook
2012-11-20 16:46:22 +02:00
Dmitriy Zaporozhets
f6248c255e
User custom method for services array
2012-11-20 14:22:00 +02:00
Dmitriy Zaporozhets
93fdc4ca9d
Reannotated
2012-11-20 14:19:55 +02:00
Dmitriy Zaporozhets
9f65c274ef
Fix ci service creation logic
2012-11-20 14:16:04 +02:00
Dmitriy Zaporozhets
406a0c809b
GitLabCi Service imtegration
2012-11-19 22:34:05 +03:00
Dmitriy Zaporozhets
8500743464
Post Receive Refactored. Service hooks also triggered now
2012-11-19 21:44:05 +03:00
Dmitriy Zaporozhets
95c23b2f97
Annotated. schema updated
2012-11-19 21:24:05 +03:00
Dmitriy Zaporozhets
c3b074acab
Service model and service hook
2012-11-20 11:33:49 +02:00
Dmitriy Zaporozhets
4eef112462
Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner
...
Cannot remove user that owns a project.
2012-11-19 04:12:31 -08:00
Dmitriy Zaporozhets
cd15e89135
Merge pull request #2008 from Partugal/patch-default-order
...
add order for projects admin page
2012-11-19 04:11:18 -08:00
Dmitriy Zaporozhets
6878f55620
Bigger file name for commits diff
2012-11-19 14:01:40 +02:00
Dmitriy Zaporozhets
86b181398c
Merge pull request #2011 from koenpunt/extended-image-diff
...
Optimized commit diff views, now showing file size and file mode changes
2012-11-19 04:01:49 -08:00
Sergey Linnik
bb3fc1e04e
add order to projects admin page
2012-11-18 22:36:22 +04:00
Valeriy Sizov
e226551e81
Fix hooks for merge request which were accepted by web-interface
2012-11-18 19:56:29 +02:00
Koen Punt
3ac1f9459a
Optimized commit diff views, now showing file size and file mode changes
...
Replaced commit status images (diff_file_*.png) with fontawesome icons
2012-11-18 17:41:41 +01:00
Riyad Preukschas
51f48392ab
Fix type error if there is a different location hash
2012-11-17 22:26:22 +01:00
Riyad Preukschas
98e938bdb0
Fix editor form, styles and JS
2012-11-17 15:43:13 +01:00
Riyad Preukschas
7caf4de2cf
Fix setting Ace mode
2012-11-17 15:28:32 +01:00
Riyad Preukschas
6c1b44859d
Fix Haml indenting file content
2012-11-17 01:00:26 +01:00
Alexey Loktionov
31bf0cd876
fix projects sorting; fix Postgresql issue with LIMIT and DISTINCT; fix query performance
2012-11-16 22:31:17 +04:00
Marin Jankovski
19e8473eb7
Cannot remove user that owns a project.
...
Cannot remove user that owns a project.
Make lines shorter, set alert, use path instead of url.
2012-11-16 14:47:07 +01:00
Dmitriy Zaporozhets
b339c747a9
Merge pull request #1937 from riyad/add-file-line-links
...
Add file line links
2012-11-16 03:46:43 -08:00
Riyad Preukschas
ece563296b
Fix Notes JS
...
Also fixes #1983
2012-11-14 14:36:51 +01:00
Riyad Preukschas
578cf89812
Fix specs
2012-11-14 01:20:37 +01:00
Dmitriy Zaporozhets
f0a6fbaae3
Improve Commits stats code
2012-11-13 21:26:57 +02:00
Dmitriy Zaporozhets
9d499b86f8
Fix loader hiding when create new project
2012-11-13 12:36:41 +02:00
Dmitriy Zaporozhets
3c7806c3f2
Improve lists. Remove unneccessary padding
2012-11-11 00:08:42 +02:00
Dmitriy Zaporozhets
283a9c7b7d
Fix margin-right for some avatars
2012-11-10 23:45:13 +02:00
randx
3e04673334
Added feature test for stats
2012-11-10 23:33:10 +02:00
randx
1c5b2a5153
Stats page
2012-11-10 23:08:47 +02:00
Riyad Preukschas
c42ada9bee
Allow linking to file lines
...
Supported formats: "L12" for single lines and "L12-34" for multiple lines
2012-11-10 00:03:46 +01:00
Riyad Preukschas
45dcb1b5c4
Add jQuery.ScrollTo
2012-11-09 23:35:02 +01:00
Saito
b664b784f1
linguist and web browser will take care of mimetype and encoding problem.
2012-11-10 01:06:20 +08:00
jdamick
12c0408ef5
Update app/views/notify/project_access_granted_email.html.haml
...
changing wording to sound more better.
2012-11-09 11:03:42 -05:00
Saito
f1ac2a616b
remove encode lib, clean all encoded area.
2012-11-09 01:41:07 +08:00
Dmitriy Zaporozhets
784cb886cf
Sign in screen: removed hr, added clearfix
2012-11-07 17:49:52 +02:00
Dmitriy Zaporozhets
b7445bb006
Fix github issue #1946
2012-11-07 17:15:41 +02:00
Dmitriy Zaporozhets
8114d36caf
Merge pull request #1720 from coagulant/wiki_search
...
Wiki search
2012-11-07 03:51:20 -08:00
Riyad Preukschas
10d881c9ca
Line anchors for file view
2012-11-07 13:31:26 +02:00
Riyad Preukschas
be4138af75
Log caught exceptions
2012-11-06 21:16:47 +01:00
Dmitriy Zaporozhets
96b2959fe3
Styled chosen css. Lighter box shadow for blocks
2012-11-06 19:31:01 +02:00
Dmitriy Zaporozhets
949233aa1f
Changed default icon for gravatar. Moved filter out of layout
2012-11-06 13:47:43 +02:00
Dmitriy Zaporozhets
f555578414
Added EventFilter class. Compeleted first version of dashbaord filtering
2012-11-05 20:12:26 +02:00
Dmitriy Zaporozhets
ba567c8d76
Merge pull request #1914 from tsigo/issue/1910
...
Fix double icon on header button hover
2012-11-05 03:27:48 -08:00
Valeriy Sizov
4f04d7df66
Merge pull request #1915 from tsigo/issue/1912
...
Fix rendered action for password change failure
2012-11-05 01:29:03 -08:00
Robert Speicher
89d9319a79
Fix rendered action for password change failure
...
Closes #1912
2012-11-04 16:47:37 -05:00
randx
f082c8ae2a
Decouple and refactor GraphCommit
2012-11-04 23:43:33 +02:00
Robert Speicher
97bf7ac397
Fix double icon on header button hover
2012-11-04 16:29:44 -05:00
Dmitriy Zaporozhets
f8e27b92bf
Merge pull request #1902 from tsigo/breadcrumbs
...
Fix breadcrumb links on Commits page
2012-11-02 03:46:27 -07:00
Riyad Preukschas
48de0ba867
Fix source for iframe on Resque admin page
2012-11-01 23:34:16 +01:00
Robert Speicher
e60185699b
Add 'breadcrumbs' helper for Commit breadcrumb links
...
Closes #1731
2012-11-01 17:58:13 -04:00
Robert Speicher
badb092a2d
Don't initialize Tree History unless tree-slider is present
...
This was breaking breadcrumb links on non-Tree pages
2012-11-01 17:57:12 -04:00
Robert Speicher
57e6777b3c
Remove "remote" attribute from Tree breadcrumb links
...
See https://github.com/gitlabhq/gitlabhq/pull/1665#discussion_r1804447
2012-11-01 17:56:39 -04:00
Dmitriy Zaporozhets
d9c20cf5a6
Fix 404 errors on Merge Request -> new
2012-10-31 14:29:42 +02:00
Dmitriy Zaporozhets
404040d7ae
Fix invalid template path for huge commit
2012-10-30 13:35:57 +02:00
Dmitriy Zaporozhets
8272e18e57
Project path validation: array of not allowed paths
2012-10-30 13:27:15 +02:00
randx
36dbac2fd9
More seeds
2012-10-30 10:03:21 +02:00
randx
e4cf99db46
Refactor milestones related functionality. Added seeds for Milestine and MR
2012-10-30 09:22:24 +02:00
Valeriy Sizov
53a3be03fc
Update app/views/profile/account.html.haml
...
TYPO #1870
2012-10-30 00:32:32 +02:00
Valeriy Sizov
9d56c7f657
Update app/views/shared/_no_ssh.html.haml
...
TYPO
2012-10-30 00:29:13 +02:00
randx
a8398e5124
Fix merge request count for milestone index
2012-10-29 23:50:35 +02:00
randx
e705344daa
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2012-10-29 23:46:46 +02:00
randx
f417a265d7
Finalize milestones for Merge Requests
2012-10-29 23:45:11 +02:00
Riyad Preukschas
0a9adbbe4a
Fix no SSH key warning
2012-10-29 21:51:28 +01:00
randx
d4e070cfad
Improve styles. Add merge request completness to milestone percentage
2012-10-29 22:40:00 +02:00
randx
ecdf778e80
Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr
...
Conflicts:
app/views/merge_requests/_form.html.haml
2012-10-29 21:37:46 +02:00
Dmitriy Zaporozhets
50a6c614b5
Merge pull request #1818 from riyad/refactor-satellite-actions
...
Refactor Satellite Code
2012-10-29 04:12:26 -07:00
Sergio Visinoni
263282dec9
Show Milestone information in MR Listing
...
When a MR belongs to a Milestone, show this information in the listing
with a small box telling the Milestone title.
2012-10-28 09:31:52 +01:00
Riyad Preukschas
646bad43e9
Fix styles
2012-10-27 18:27:51 +02:00
Riyad Preukschas
3d0197246e
Use #author_link for blame, commits and tree
2012-10-27 18:27:47 +02:00
Riyad Preukschas
c78359a84b
Generalize CommitDecorator#author_link to #person_link
2012-10-27 18:15:00 +02:00
Riyad Preukschas
17cec05087
Make new/edit issue forms use containers on the page instead of adding their own
...
Fixes #1830
2012-10-27 17:54:24 +02:00
Riyad Preukschas
2f5e44a02d
Enable/disable from buttons on all input events (not just key events)
...
Fixes #1836
2012-10-27 17:00:51 +02:00
randx
3c5a3fe0ae
Merge branch 'front-end' of https://github.com/NARKOZ/gitlabhq into NARKOZ-front-end
...
Conflicts:
app/views/issues/_form.html.haml
2012-10-27 11:24:11 +03:00
randx
72f984e3d3
Prevent grit from caching graph commits
2012-10-26 21:52:26 +03:00
Dmitriy Zaporozhets
1c9351abf0
Restyle branches list. Remove unneccesary styles from tree avatar
2012-10-26 19:00:09 +03:00
Dmitriy Zaporozhets
b4708d006c
Restyled git tags page. Added truncated tags message
2012-10-26 18:37:12 +03:00
Sergio Visinoni
e51c37bdbd
Display Merge Requests <-> Milestone relations
...
Show the relation between Merge Requests and Mileston in different
places:
- Merge Request page
- Milestone list page
- Milestone details page
2012-10-26 16:12:40 +02:00
Sergio Visinoni
a7d0816933
Add Milestone information in Merge Requests
...
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
Merge Requests listing page
2012-10-26 16:12:40 +02:00
Riyad Preukschas
700a784bc9
Refactor EditFileAction#update and rename it to commit!
2012-10-26 01:59:50 +02:00
Riyad Preukschas
fba8ad5607
Move Gitlab::Satellite into the Satellite module
2012-10-26 00:56:24 +02:00
Riyad Preukschas
5f16687805
Update arguments for Gitlab::Satellite::EditFileAction#initialize
2012-10-26 00:39:23 +02:00
Riyad Preukschas
55779b00ea
Rename Gitlab::FileEditor to Gitlab::Satellite::EditFileAction
2012-10-26 00:33:53 +02:00
Riyad Preukschas
8c89beb6f9
Change argument order for satellite actions to always start with the user
2012-10-26 00:26:47 +02:00
Riyad Preukschas
78235edda8
Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction
2012-10-26 00:19:01 +02:00
Riyad Preukschas
0447ab375a
Extract shared/clone_panel partial
2012-10-25 23:39:02 +02:00
Riyad Preukschas
ff396e0a7e
Extract search field into a partial
2012-10-25 23:39:02 +02:00
hardchor
b5ced56ba4
Some grammatical improvements
...
Nothing too dramatic, just some improvements.
2012-10-25 22:11:06 +02:00
Dmitriy Zaporozhets
11452c903f
Fix 500 error on tree view woth submodule
2012-10-25 12:30:09 +03:00
Dmitriy Zaporozhets
6d0dcb6614
Reduce max commit diff size. Added Commit::DIFF_SAFE_SIZE
2012-10-25 12:16:14 +03:00
Scott Holden
2335d7b9cf
Fix broken Note scopes with lambdas, 4.0 compat
...
Without lambdas, Date.today will be evaluated in the class body.
For it to have a running scope of last week etc, it will need to
be evaluated each time the scope is called.
In Rails 4.0, lambdas will be required for all scopes, so not a bad
idea to go ahead and change them all now.
2012-10-24 21:54:15 -07:00
Valery Sizov
38175209c5
Merge branch 'feature/import_team_from_other_project' of dev.gitlabhq.com:gitlabhq
2012-10-24 12:56:47 +00:00
Dmitriy Zaporozhets
a7efeb3781
Fix chrome issues list
2012-10-24 15:25:28 +03:00
Dmitriy Zaporozhets
6f4576b743
Spinach feature
2012-10-24 15:23:04 +03:00
Dmitriy Zaporozhets
b7a9e41bd2
Handle perfomance issue with team import. Model specs
2012-10-24 14:52:17 +03:00
Dmitriy Zaporozhets
fd0aca1225
Feature implemented
2012-10-24 14:20:53 +03:00
Staicu Ionut
2d7062d8fc
Added autofocus for issue title
2012-10-24 14:06:10 +03:00
Dmitriy Zaporozhets
b2df61d85a
Fix 500 error on admin project if empty
2012-10-23 11:29:47 +03:00
randx
9902f1af6e
Reduce line-height for commits diff lines
2012-10-22 23:49:21 +03:00
randx
e51b2d58e7
Restyled last push widget. Increased line-height for td in tables
2012-10-22 23:37:50 +03:00