Dmitriy Zaporozhets
fa9a8c3847
Remove team_member show page -> use user_path instead
2013-03-13 19:16:36 +02:00
Dmitriy Zaporozhets
70fc1c5021
cleanup ProjectMover
2013-03-12 14:13:25 +02:00
Dmitriy Zaporozhets
6755d9908f
Merge pull request #3196 from Undev/feature/broken-projects-search-23049
...
Broken projects search on dashboard
2013-03-12 04:31:57 -07:00
Dmitriy Zaporozhets
102695530b
fix project move email
2013-03-12 12:40:49 +02:00
Dmitriy Zaporozhets
59b36f2032
Use gitlab-shell to move repos. Requires gitlab-shell v1.1.0
2013-03-12 12:37:53 +02:00
Andrew8xx8
23f8f13ea4
Search fields were have same id's. Fixed
2013-03-12 13:41:23 +04:00
Andrew8xx8
072883fd08
Search projects on dashboard was not worked. Fixed
2013-03-12 13:26:45 +04:00
Dmitriy Zaporozhets
b1e425511f
restyle and cleanup emails
2013-03-12 10:46:04 +02:00
Sato Hiroyuki
197f9abedf
Covert to coffee.
2013-03-11 21:41:24 +09:00
Sato Hiroyuki
b8f070f0d1
Rename to coffee.
2013-03-11 21:32:44 +09:00
Dan Knox
1479f17227
Add Spinach coverage for Gollum Wiki system and correct the Delete link.
...
The previously failing Spinach steps have been fixed with this commit.
I have also added new steps that cover the entire usage of the Wiki
system.
The new Spinach steps revealed a minor bug in the Delete page process.
The path for the "Delete this page" button was previously set to
`project_wikis_page(@project, @wiki)` when it should have been
using the singular `project_wiki_page(@project, @wiki)` path helper.
The link has been corrected and all steps are now passing.
2013-03-10 14:59:20 -07:00
Dmitriy Zaporozhets
473efc82b6
Group and team rss is valid now
2013-03-10 12:16:57 +02:00
Dmitriy Zaporozhets
8812d9dee2
Move groups and teams to tabs on dashboard. Remember tab with cookie
2013-03-10 11:57:14 +02:00
Dmitriy Zaporozhets
96c627edd8
Merge pull request #3169 from hiroponz/refactor-network-graph
...
Refactor network graph
2013-03-10 01:00:14 -08:00
Dan Knox
ea9b3687db
Replace current Wiki system with Gollum Wikis.
...
This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.
The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:
* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.
The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
2013-03-09 16:39:51 -08:00
Dmitriy Zaporozhets
8e8372d5ce
better logo images for header
2013-03-10 00:12:25 +02:00
Dmitriy Zaporozhets
9c709be335
fix event relative date being cached
2013-03-08 13:14:47 +02:00
Sebastian Ziebell
3374027e3a
Merge branch 'master' into fixes/api, code clean up and tests fixed
...
Conflicts:
doc/api/projects.md
spec/requests/api/projects_spec.rb
2013-03-07 14:51:56 +01:00
Sato Hiroyuki
c0d312bebe
Refactor: Removing a if statement, because the nil value is already removed in the view template.
2013-03-07 21:10:40 +09:00
Sato Hiroyuki
b7e5f4556b
Refactor: Removing the duplicated code.
2013-03-07 21:10:27 +09:00
Sato Hiroyuki
79cd1ca304
Refactor: change the map hash from a local variable to private variable.
2013-03-07 19:52:46 +09:00
Sato Hiroyuki
ccc712b198
Refacor: removing the times array, because that is same with @commits array.
2013-03-07 19:16:51 +09:00
Dmitriy Zaporozhets
a32f85ac76
Merge pull request #3139 from rapofran/auto_focus_ldap_login
...
Autofocus to username input (LDAP login).
2013-03-07 01:55:19 -08:00
Dmitriy Zaporozhets
ca9098d898
remove last commit widget, added repo size and owner info on project home page
2013-03-07 11:14:19 +02:00
Sato Hiroyuki
8c5003cf75
Refactor: clean up models.
...
* Network::Commit
** Removing unnecessary accessors.
** Removing add_refs methods.
* Network::Graph
** Removing unnecessary accessors.
** The 3 times loop of commits don't need.
2013-03-07 17:56:01 +09:00
Dmitriy Zaporozhets
e90277f9b5
show project description on public area
2013-03-07 10:08:43 +02:00
Sato Hiroyuki
e03a018d28
Refactor: rename module and class names.
...
* Module: Graph -> Network
* Class: JsonBuilder -> Graph
2013-03-07 15:42:30 +09:00
Sato Hiroyuki
784aa266bd
Refactor: grouping parent and their space by including array.
2013-03-07 15:19:42 +09:00
Sato Hiroyuki
2f7f46b256
Refactor: replace "render :json = graph.to_json" to view template(show.json.erb).
...
Because model shouldn't know about view logic.
2013-03-07 15:19:32 +09:00
Dmitriy Zaporozhets
9dc46eee8e
Return project description back
2013-03-06 22:56:48 +02:00
Dmitriy Zaporozhets
7b38a0de98
show highlighted code correctly inside issue body
2013-03-06 21:48:15 +02:00
Dmitriy Zaporozhets
872cf404eb
fix js syntax error
2013-03-06 21:39:10 +02:00
Dmitriy Zaporozhets
19e9c736e7
add system hooks api docs to help content
2013-03-06 21:12:47 +02:00
Dmitriy Zaporozhets
4c1538a946
Use redis as cache storage. cache events
2013-03-06 17:30:48 +02:00
Dmitriy Zaporozhets
40f1868194
Fix loading animation while browsing tree
2013-03-06 17:12:28 +02:00
Dmitriy Zaporozhets
d03af842c5
fix public projects identations
2013-03-06 09:12:14 +02:00
Sebastian Ziebell
61cfa2a7a6
Merge branch 'master' into fixes/api
...
Conflicts:
lib/api/projects.rb
2013-03-05 22:29:49 +01:00
Dmitriy Zaporozhets
6beae84ea3
reduce letter-spacing for top nav
2013-03-05 17:28:13 +02:00
Dmitriy Zaporozhets
a99ad3d355
tree_heleper: concat html only if present. Avoid nil exception
2013-03-05 17:15:20 +02:00
Dmitriy Zaporozhets
9ba21dd0c4
better solution for #3027
2013-03-05 17:07:12 +02:00
Dmitriy Zaporozhets
da6b53a80e
Merge branch 'omniauth_no_email_1' of https://github.com/gliptak/gitlabhq into gliptak-omniauth_no_email_1
...
Conflicts:
app/observers/user_observer.rb
spec/observers/user_observer_spec.rb
2013-03-05 16:48:18 +02:00
Dmitriy Zaporozhets
d5d9f1c515
Merge pull request #2015 from elvanja/commits-group-and-sort-by-date-desc
...
fix: grouping commits by date desc doesn't sort the groups too
2013-03-05 06:40:13 -08:00
Dmitriy Zaporozhets
c2ba868c9b
Merge pull request #2954 from cabeca/fix-image-url-emoji
...
Fix image url for emoji.
2013-03-05 05:52:01 -08:00
Dmitriy Zaporozhets
f22488f726
Merge pull request #3143 from Undev/state-machine-3
...
State machine 3
2013-03-05 05:38:16 -08:00
Dmitriy Zaporozhets
f9200e118c
remove custom font
2013-03-05 13:16:56 +02:00
Dmitriy Zaporozhets
9bb35e7e59
Prevent app crash if team owner removed
2013-03-05 09:27:06 +02:00
Dmitriy Zaporozhets
3a09f02e11
Merge pull request #3109 from hiroponz/improve-network-graph
...
Improve network graph
2013-03-04 23:02:27 -08:00
J. Francisco Raposerias
a40541c42d
add autofocus to username input
2013-03-04 17:54:26 -03:00
Dmitriy Zaporozhets
bf06b3196d
Make clone widget read-only
2013-03-04 22:18:53 +02:00
Dmitriy Zaporozhets
730e79e787
better event-notes typography
2013-03-04 22:00:51 +02:00
Dmitriy Zaporozhets
d54845a16a
use md-typography for note content
2013-03-04 21:34:26 +02:00
Dmitriy Zaporozhets
dc7507cfe7
= preserve do was ignored for empty project page so was replaced with filter
2013-03-04 21:12:36 +02:00
Dmitriy Zaporozhets
533693ab41
Fix dark color bg for wiki
2013-03-04 21:11:03 +02:00
Dmitriy Zaporozhets
24cc0faf2c
add link ti public area
2013-03-04 20:11:23 +02:00
Dmitriy Zaporozhets
c2082f4d78
Fix edit team page
2013-03-04 19:47:20 +02:00
Andrew8xx8
0d9a6fe7b1
User's blocked field refactored to use state machine
2013-03-04 18:52:30 +04:00
Dmitriy Zaporozhets
5b4032d175
Merge pull request #3118 from 2called-chaos/dont_send_mails_twice
...
Do not send issue status mail twice if author = assignee
2013-03-02 10:48:22 -08:00
Dmitriy Zaporozhets
907c334fe0
fix decorate call for milestone users
2013-03-02 13:23:30 +02:00
Dmitriy Zaporozhets
ef646928e4
better presenting for group description
2013-03-01 16:26:26 +02:00
Sven Pachnit
c280c3ce6d
Do not send issue status mail twice if author = assignee
2013-03-01 15:09:14 +01:00
Dmitriy Zaporozhets
5c3cb47c16
Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
...
Conflicts:
db/schema.rb
2013-03-01 16:05:51 +02:00
Dmitriy Zaporozhets
dbcf4144ee
use simple decorate on single commits
2013-03-01 15:35:22 +02:00
Dmitriy Zaporozhets
6aead7991f
fix decorate calls on collections after draper update
2013-03-01 15:24:59 +02:00
Dmitriy Zaporozhets
22d6ce9873
Merge pull request #3082 from devote/patch-1
...
Distorted lines in `diff`
2013-02-28 23:46:07 -08:00
Dmitriy Zaporozhets
1c517153a8
fix admin users tests
2013-02-28 19:56:36 +02:00
Dmitriy Zaporozhets
115454f3ed
created-by-me filter for issues inside project. Fixed global project.issues order
2013-02-28 17:46:28 +02:00
Dmitriy Zaporozhets
e1f77b9be0
Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker
...
Conflicts:
Gemfile.lock
2013-02-28 17:02:20 +02:00
Andrew8xx8
2f1f05d431
Fixed notes from randx
2013-02-28 18:55:35 +04:00
Thomas Berger
7ed0878654
added text-templates for mail notification
2013-02-28 16:39:58 +02:00
Andrew8xx8
d3f042a6f2
Css classes improved
2013-02-28 18:35:27 +04:00
Andrew8xx8
9c747fbb95
Missing descriptions added
2013-02-28 17:37:02 +04:00
Andrew8xx8
9959669f1c
Desctiptions removed from dashboard
2013-02-28 17:15:22 +04:00
Andrew8xx8
3d4e32457b
Table description indentation fixed
2013-02-28 17:15:22 +04:00
Andrew8xx8
5f657203a1
Description added to temas
2013-02-28 17:15:22 +04:00
Andrew8xx8
9f45e01e84
Description to groups added
2013-02-28 17:14:21 +04:00
Andrew8xx8
cff845784e
Show Issues tracker select only if one or more remote issue trackers available
2013-02-28 16:11:14 +04:00
Andrew8xx8
b6d0f2852d
Issues link from project page follows on remote bug tracker if it selected now
2013-02-28 16:11:14 +04:00
Andrew8xx8
ab98db73a3
Issues tracker settings enableds/disableds without page reloading now
2013-02-28 16:11:14 +04:00
Andrew8xx8
bca72eac74
Default issue tracker name added to gon variables
2013-02-28 16:11:14 +04:00
Andrew8xx8
cf3cf3750e
Gem gon added. It produces server-side variable values in javascript
2013-02-28 16:11:14 +04:00
Andrew8xx8
c643b50dbd
Default value for issues_tracker setting added
2013-02-28 16:11:13 +04:00
Andrew8xx8
16c720fd96
Issues helper improved
2013-02-28 16:11:13 +04:00
Andrew8xx8
0afdf39dbc
New field added
2013-02-28 16:11:13 +04:00
Andrew8xx8
68a7ecdaaf
Project issue tracker functions refactored
2013-02-28 16:10:00 +04:00
Andrew8xx8
999fc2391b
Issue tracker added to edit project form in admin area
2013-02-28 16:10:00 +04:00
Andrew8xx8
e6d2e56961
Issue tracker field added to projects
2013-02-28 16:10:00 +04:00
Dmitriy Zaporozhets
fa6bf2c0f5
remove unnecessary center tag in devise layout
2013-02-28 12:08:25 +02:00
Dmitriy Zaporozhets
54d95f5897
Restyle flash message. Not it does not overflow head panel
2013-02-28 11:06:52 +02:00
Sato Hiroyuki
2a687dd562
Show gravatar icon on tooltip.
2013-02-28 14:56:27 +09:00
Sato Hiroyuki
00d0e57e85
Commits are arranged below their first parent.
2013-02-28 11:46:17 +09:00
Sato Hiroyuki
14c2a37da2
A tip is made slanting.
2013-02-28 11:44:52 +09:00
Sato Hiroyuki
38fce3deb0
It improves detecting an overlap of a line
2013-02-28 11:44:40 +09:00
Dmitriy Zaporozhets
863d297ede
reduce fonts size for wiki render
2013-02-27 21:10:23 +02:00
Dmitriy Zaporozhets
b2a69262e1
Merge pull request #3101 from tsl0922/master
...
Fix project transfer error
2013-02-27 10:48:14 -08:00
Dmitriy Zaporozhets
92039dd677
Developers can merge MR if target branch is not protected
2013-02-27 20:20:31 +02:00
Sebastian Ziebell
3bb342b961
Merge branch 'master' into fixes/api
2013-02-27 17:52:59 +01:00
Dmitriy Zaporozhets
b3d648b4e8
Prevent duplicate merge events
2013-02-27 17:48:51 +02:00
Sato Hiroyuki
f11e855bdb
Finding free space from the way near commit which is downward
2013-02-27 21:49:53 +09:00
tsl0922
df63ab78a8
Fix project transfer error
2013-02-27 18:27:10 +08:00
Sebastian Ziebell
ac4a09e9cc
Merge branch 'master' into fixes/api
2013-02-27 10:16:48 +01:00
Dmitriy Zaporozhets
cba6e92436
move transfer logic out of project to service
2013-02-26 23:14:32 +02:00
Dmitriy Zaporozhets
0cf0487d65
Fix TestHookContext
2013-02-26 23:04:14 +02:00
Sato Hiroyuki
aa36f07a02
Fix the commits are not ordered commiter date.
...
It is fixed that the date label of network graph is broken.
2013-02-26 21:20:14 +09:00
Sato Hiroyuki
d8a40d8c93
Move graph module from lib or vendor directory to app directory.
...
Because not autoloading lib directory at development mode.
2013-02-26 20:31:39 +09:00
Dmitriy Zaporozhets
15c0e58a49
remove unused code related to gitolite
2013-02-26 11:11:43 +02:00
Dmitriy Zaporozhets
c08f19f275
email validation added
2013-02-26 11:09:32 +02:00
Dmitriy Zaporozhets
5ac5510fd6
Fix automerge detection client-side since #3056
2013-02-26 10:47:27 +02:00
Dmitriy Zaporozhets
d7b667fee2
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2
...
Conflicts:
app/models/merge_request.rb
2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets
0cc95ef2f5
Merge pull request #2889 from kennytm/master
...
Show only ≤16 lines of codes in a discussion in a MR (issue #2860 ).
2013-02-26 00:32:02 -08:00
Dmitriy Zaporozhets
573942263a
Fix issue edit button showup
2013-02-26 10:17:09 +02:00
Dmitriy Zaporozhets
39fe9b644f
Add close issue to note actions bar
2013-02-25 23:10:50 +02:00
Dmitriy Zaporozhets
8de19b259e
proper name for issue partial
2013-02-25 22:56:10 +02:00
Dmitriy Zaporozhets
5e69ad2cea
Sanitize user profile input
2013-02-25 22:51:15 +02:00
Dmitriy Zaporozhets
db8baf2895
Since search_autocomplete_source rendered with raw all human input should be sanitized to prevent XSS
2013-02-25 22:12:11 +02:00
Dmitriy Zaporozhets
f17fe7fff2
correct indentation in activity observer
2013-02-25 21:26:15 +02:00
Dmitriy Zaporozhets
7bab81b199
Move git post push logic to service
2013-02-25 21:21:38 +02:00
Dmitriy Zaporozhets
9611640e38
Merge pull request #3052 from Undev/system-hook-observer-improves
...
System hooks code & logic refactoring
2013-02-25 10:15:23 -08:00
Dmitrii Pakhtinov
e975ed836d
Distorted lines in diff
...
Distorted lines in `diff` when viewing files `windows-style-line-separator: \r\n`
2013-02-25 12:21:38 +04:00
Dmitriy Zaporozhets
ed60b6fc90
Merge pull request #3071 from dmedvinsky/fix-webhook-auth
...
Fix WebHook and special symbols in credentials
2013-02-24 04:13:15 -08:00
Dmitriy Zaporozhets
3432c9aed7
Merge pull request #3072 from dmedvinsky/add-title-remove-member
...
Add title for "Remove from team" button
2013-02-24 04:04:58 -08:00
Dmitry Medvinsky
b0fb68c191
Add transition on search box
...
It's kind of cool trend to use animated-expanding search box nowadays.
E.g. see Github.
2013-02-22 20:50:17 +04:00
Dmitry Medvinsky
30180ed82e
Add title for "Remove from team" button
2013-02-22 20:29:03 +04:00
Dmitry Medvinsky
dbd9d8d4c3
Fix WebHook and special symbols in credentials
...
When using web hook with credentials secured web resource, one needs to
put the credentials in the hook URL.
If the credentials contain special symbols (e.g. @ or #), it should be
URL-quoted (e.g. %40 instead of @).
But when Gitlab is making a request, it should unquote the symbols
before base64-encoding them.
2013-02-22 20:10:25 +04:00
Dmitriy Zaporozhets
99b6750e15
Restore old order for MR lists. Fix failing tests
2013-02-21 16:26:09 +02:00
Dmitriy Zaporozhets
4a137651ec
Fix merge request closed filter. Fixed one more test
2013-02-21 14:11:24 +02:00
Dmitriy Zaporozhets
5aeaf248f1
Fixing rspec after upgrade to capybara pt1
2013-02-21 13:09:47 +02:00
Andrew8xx8
c77730dd71
An Id must be sended to queue
2013-02-21 14:04:06 +04:00
Dmitriy Zaporozhets
28da2a8bdc
Monkeypatch satellite call for merge request in tests
2013-02-21 11:44:33 +02:00
Dmitriy Zaporozhets
42ce2c1080
improve selectors to pass capybara 2.0
2013-02-21 11:27:22 +02:00
Dmitriy Zaporozhets
585259b837
Fix merge state detection
2013-02-21 09:25:07 +02:00
Andrew8xx8
6d68923edc
human_merge_status replaced by human_merge_status_name
2013-02-20 17:50:29 +04:00
Andrew8xx8
52e0df5c23
class.self methods moved to scopes
2013-02-20 17:50:24 +04:00
Andrew8xx8
e2d94e0719
State machine added for merge_status field
2013-02-20 17:49:48 +04:00
Sebastian Ziebell
eefb27f5ae
Merge branch 'master' into fixes/api
...
Conflicts:
spec/requests/api/projects_spec.rb
2013-02-20 12:43:32 +01:00
Andrew8xx8
99760edc75
Method moved to service
2013-02-20 15:33:03 +04:00
Andrew8xx8
aa1780d03c
System hooks execution moved to System hook service
2013-02-20 14:53:15 +04:00
Dmitriy Zaporozhets
b7ac654b88
Merge pull request #2988 from Asquera/error_project_limit
...
API: creating last project before limit returns 404
2013-02-20 02:47:30 -08:00
Andrew8xx8
468c8c5f0a
A little bit of codestyle improvments
2013-02-20 13:15:56 +04:00
Dmitry Medvinsky
eb58529757
Add commit full time tooltip to commited_ago
2013-02-19 19:56:43 +04:00
Andrew Kulakov
303fb06c96
Event already has author relation
2013-02-19 15:22:29 +04:00
Dmitriy Zaporozhets
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
Andrew8xx8
6e333d5075
Javascript widget fixed
2013-02-19 12:57:09 +04:00
Dmitriy Zaporozhets
52028dcd2d
Merge pull request #3013 from crystax/master
...
Sort groups alphabetically on dashboard page
2013-02-19 00:51:08 -08:00
Dmitriy Zaporozhets
bfc359ca61
Fix project filter for MR on dashboard
2013-02-19 09:43:41 +02:00
Dmitry Moskalchuk
f7ae1bce25
Syntax fix of sorting groups/users
2013-02-19 11:13:19 +04:00
Dmitriy Zaporozhets
ba937b2b3d
Dont show assigned_teams block unless any. Show count in filter
2013-02-18 21:21:24 +02:00
Dmitriy Zaporozhets
a29db26cc9
Refactor and restyle team page for project
2013-02-18 21:10:49 +02:00
Dmitriy Zaporozhets
e9d8d074a1
no projects message in group area
2013-02-18 20:31:43 +02:00
Dmitriy Zaporozhets
e049e18780
Merge pull request #2991 from raphendyr/username_change_disablation
...
Add option to disable username changing
2013-02-18 09:59:24 -08:00
Dmitriy Zaporozhets
ea28519f57
Merge pull request #2996 from raphendyr/ssh_fingerprint_fix
...
Ssh fingerprint fix
2013-02-18 09:56:35 -08:00
Dmitriy Zaporozhets
97de6f851b
Fix not-working team memebership permissions change
2013-02-18 16:40:11 +02:00
Andrew8xx8
d27ed43daa
Hash syntax improved
2013-02-18 17:22:18 +04:00
Andrew8xx8
557a9fa321
Debug remomved
2013-02-18 17:16:29 +04:00
Andrew8xx8
ff94f29be5
States events fixed
2013-02-18 16:49:56 +04:00
Andrew8xx8
231d9e0426
Observer refactored to use StateMachine events
2013-02-18 16:49:17 +04:00
Dmitriy Zaporozhets
1481d1cfe0
Merge branch 'count_user_owned_projects' of /home/git/repositories/gitlab/gitlabhq
2013-02-18 12:46:45 +00:00
Dmitriy Zaporozhets
01a7250ba5
Add user to team he creates
2013-02-18 14:35:38 +02:00
Marin Jankovski
1734611181
Count owned projects, not just personal
2013-02-18 13:15:35 +01:00
Andrew8xx8
6074896cbf
Spinach tests fixed
2013-02-18 14:43:50 +04:00
Andrew8xx8
1644117a1a
Issue uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
0b512af803
Milestone uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
29f70acc98
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
Andrew8xx8
f97296597c
Issuable consern uses StateMachine now
2013-02-18 14:43:49 +04:00
Andrew8xx8
8db3920c01
State renamed to merge_status
2013-02-18 14:43:49 +04:00
Dmitriy Zaporozhets
020078663e
Prevent xss attack over group name. Added regex validation for group and team name
2013-02-18 09:28:18 +02:00
Dmitriy Zaporozhets
cfdf94fc27
use attachment secure_url for Attachemnt page
2013-02-17 16:18:42 +02:00
Dmitriy Zaporozhets
0d3b75845a
Merge pull request #3017 from jojosch/owner-link-admin
...
Fix link to owner of group and team in admin interface
2013-02-17 06:15:33 -08:00
Miguel Cabeça
157b038661
Include Riyad Preukschas suggestions.
2013-02-17 13:02:22 +00:00
Dmitriy Zaporozhets
1efeb1b562
redesign mars theme a bit. Better border color for search-input for dark theme
2013-02-17 12:16:19 +02:00
Dmitriy Zaporozhets
32a5548c41
Fix link color for dark theme
2013-02-17 12:05:26 +02:00
Johannes Schleifenbaum
3ae7a45d5a
Fix link to owner of group and team in admin interface
2013-02-17 11:00:02 +01:00
Dmitriy Zaporozhets
9764ba6df2
create satellite for imported repo
2013-02-16 21:47:43 +02:00
Dmitriy Zaporozhets
42ffbea8e0
Fix logo alignment for default theme
2013-02-16 21:37:06 +02:00
Dmitriy Zaporozhets
18a496142b
Reduce size of nav panel. Fixed nav background for IE. Refactored mars theme
2013-02-16 21:24:51 +02:00
Dmitry Moskalchuk
a9c1b85e08
Sort groups/namespaces by human name
2013-02-16 19:40:33 +04:00
Dmitry Moskalchuk
2a4ef0fe49
Sort groups alphabetically on dashboard page
2013-02-16 19:11:36 +04:00
Dmitriy Zaporozhets
fa3cc1dd24
Merge branch 'features/attachment_server' of /home/git/repositories/gitlab/gitlabhq
2013-02-16 12:45:20 +00:00
Dmitriy Zaporozhets
b729728536
uppercase Gitlab version and revision constants. check api return gitlab version now
2013-02-16 14:42:22 +02:00
Fumiya Nakamura
20868acc96
Fix file_path to correspond with the name
2013-02-15 05:50:42 -08:00
Fumiya Nakamura
a1d106110d
Fix file_name for archive
2013-02-15 05:00:15 -08:00
Jaakko Kantojärvi
6fd88b8cbb
Fix ssh key fingerprinting test to use exitcode
2013-02-15 11:16:21 +02:00
Dmitriy Zaporozhets
f6cc71bc36
Per project protection
2013-02-15 09:51:21 +02:00
Dmitriy Zaporozhets
4821aa6c25
skip protection to aws3
2013-02-15 09:49:35 +02:00
Dmitriy Zaporozhets
f9dd547aa7
remove commented code
2013-02-15 09:16:46 +02:00
Sebastian Ziebell
c8b92a4be2
Merge branch 'master' into fixes/api
2013-02-14 17:02:16 +01:00
Jaakko Kantojärvi
ba65f2910b
Add option to disable username changing
...
This option allows to disable users from changing their username.
This is very usefull in environments using strong internal authentication methods like ldap, pam or shibboleth.
You can allow users to change theyr username in these environments, but then new users (users loging in first time) is blocked from gitlab is her username exists.
2013-02-14 17:58:56 +02:00
Sebastian Ziebell
6df02adc7a
API: status code 403 returned if new project would exceed limit
...
When the project limit is reached the user is not allowed to create new ones.
Instead of error code 404 the status code 403 (Forbidden) is returned with error
message via API.
2013-02-14 15:51:56 +01:00
Dmitriy Zaporozhets
7fad4a9636
Merge pull request #2989 from PierreGambarotto/master
...
archive download : namespace directory not created
2013-02-14 05:53:07 -08:00
Pierre Gambarotto
b6b6b640b1
fix archive download : not creating namespace directory
2013-02-14 14:29:24 +01:00
Dmitriy Zaporozhets
b698094d4d
Update post-receive worker to use correct identifier
2013-02-14 14:00:02 +02:00
Sebastian Ziebell
3025824415
API: refactored last fix, project limit in web client is fixed too
...
The previous call `saved?` is restored in the `POST /projects` method in the API.
It is refactored to check if the record is persisted. This is useful to not validate
the record again after saving. This fixes the returned status code in the web client
too. If the last project is created via web client instead of error notification
the project page is shown.
2013-02-14 12:58:33 +01:00
Dmitriy Zaporozhets
ed3f44085e
Redesign Admin -> user -> show page
2013-02-13 19:14:35 +02:00
Dmitriy Zaporozhets
6b24c375cb
style admin -> users page. Search by username too
2013-02-13 17:28:28 +02:00
Dmitriy Zaporozhets
fd5dc597ed
Add placeholder for project import
2013-02-13 15:27:18 +02:00
Andrew8xx8
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
Dmitriy Zaporozhets
622dae76cc
style network graph form a bit
2013-02-12 19:22:40 +02:00
Dmitriy Zaporozhets
ddea7d1689
Merge branch 'easy-to-find-commit-on-network-graph' of https://github.com/hiroponz/gitlabhq into hiroponz-easy-to-find-commit-on-network-graph
2013-02-12 19:02:05 +02:00
Dmitriy Zaporozhets
d6513b5153
Merge pull request #2924 from cdawzrd/patch-2
...
Disable autocomplete for admin/users form
2013-02-12 08:45:07 -08:00
Dmitriy Zaporozhets
06dd530ede
Merge branch 'user_delete_account' of /home/git/repositories/gitlab/gitlabhq
2013-02-12 10:53:51 +00:00