Dmitriy Zaporozhets
bdd3513f03
Merge pull request #5373 from rtripault/milestone-iid
...
Show milestones iid instead of id
2013-10-20 07:56:45 -07:00
Robert Speicher
cb9cf077de
Refactor and cover search_autocomplete_source
2013-10-20 01:05:20 -04:00
Robert Speicher
bb494203d2
Cover the simple_sanitize helper
2013-10-19 23:57:34 -04:00
Romain
53564d9009
A few other iids instead of ids (mostly in edit forms)
2013-10-19 09:23:51 +02:00
Romain
bae18f0a98
Show milestones iid instead of id
2013-10-19 09:08:54 +02:00
Dmitriy Zaporozhets
2cd3d42181
Use gitlab_config intead of Gitlab.config.gitlab in views
2013-10-17 22:11:41 +03:00
Dmitriy Zaporozhets
ec337276c6
Merge branch 'issue_tracker' of /home/git/repositories/gitlab/gitlabhq
2013-10-17 12:58:15 +00:00
Marin Jankovski
52739518bc
Make clearer use of the check.
2013-10-17 11:36:23 +02:00
Dmitriy Zaporozhets
fd39c80f8b
No text shadow for state-label
2013-10-17 12:33:39 +03:00
Dmitriy Zaporozhets
a4de8f71c7
Minor UI improvement for ui-box-show
2013-10-17 12:31:49 +03:00
Marin Jankovski
78e591c737
Use more descriptive name for config check.
2013-10-17 10:57:58 +02:00
Marin Jankovski
ff046c7200
Fallback to internal issue tracker if config is invalid.
2013-10-17 10:42:39 +02:00
Dmitriy Zaporozhets
91a31d767f
Order milestone due date on issues page filter
2013-10-17 10:01:48 +03:00
Dmitriy Zaporozhets
399e634112
Fix GollumWiki::CouldNotCreateWikiError during tests
2013-10-17 09:48:35 +03:00
Dmitriy Zaporozhets
03dba1fd42
Merge pull request #5344 from amacarthur/thread-variable-fix
...
Fixing unsafe use of Thread.current variable :current_user
2013-10-16 23:30:44 -07:00
Dmitriy Zaporozhets
dad831662a
Merge pull request #5350 from NARKOZ/patch-0
...
fix variable name
2013-10-16 22:59:39 -07:00
Dmitriy Zaporozhets
9afc930b99
Make ui-box-show more visible. Refactor some css classes
2013-10-16 20:42:42 +03:00
Nihad Abbasov
12420a2256
refactor by_username_or_id
2013-10-16 22:31:46 +05:00
Dmitriy Zaporozhets
6404d69780
Better UX for blocked users in admin area
2013-10-16 20:19:25 +03:00
Jacob Vosmaer
babba432f1
Use service gitlab reload to restart sidekiq
2013-10-16 10:47:10 +02:00
Angus MacArthur
aefe2e952f
Fixing unsafe use of Thread.current variable :current_user
2013-10-16 01:20:53 -04:00
Dmitriy Zaporozhets
7ea00b183c
Merge branch 'sidekiq_workers_show' of /home/git/repositories/gitlab/gitlabhq
2013-10-15 17:19:18 +00:00
Marin Jankovski
a271570ea9
Show explanation .
2013-10-15 15:28:53 +02:00
Marin Jankovski
4886d8fd03
Show sidekiq running processes in the background_jobs page.
2013-10-15 13:24:17 +02:00
Dmitriy Zaporozhets
01186f9fc6
Show confirmation status in profile
2013-10-15 11:19:19 +03:00
Dmitriy Zaporozhets
2e8b0fa5cf
Oauth users and users created by admin should be confirmed immediatly
2013-10-15 09:59:58 +03:00
Dmitriy Zaporozhets
6fff92e984
Enable confirmable and reconfirmable modules for User
...
Now when you want to signup or change existing email you will be forced
to confirm that you really own this email. You get email with link to
follow in order to confirm your email address
Conflicts:
app/models/user.rb
2013-10-15 09:56:04 +03:00
David Pursehouse
2fbe4fad13
Improve the repository import message
2013-10-15 13:58:05 +09:00
Dmitriy Zaporozhets
d1a054c513
Merge branch 'fix/relative_links_in_readme' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 18:31:57 +00:00
Marin Jankovski
e649ea2fc5
Links in Readme in tree view.
2013-10-14 16:47:46 +02:00
Dmitriy Zaporozhets
d20db103c1
Merge branch 'readding_group_member' of /home/git/repositories/gitlab/gitlabhq
2013-10-14 14:41:13 +00:00
Dmitriy Zaporozhets
eda5b3b1c5
Fix relative links from Help#API page
2013-10-14 16:47:05 +03:00
Marin Jankovski
97cf31c4cb
Update user access level when adding to group.
2013-10-14 15:15:14 +02:00
Dmitriy Zaporozhets
ace9ff4a46
Merge pull request #5305 from saymedia/master
...
Fix the sigil for merge request emails
2013-10-14 06:13:43 -07:00
Dmitriy Zaporozhets
627cb28f11
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2013-10-14 14:08:41 +03:00
Dmitriy Zaporozhets
3cbfb1ee7c
Remove .git from project url end redirect
...
Ex. redirect from
localhost/group/project.git
to
localhost/group/project
It used to prevent 404 error when follow submodule http link
like http://localhost/group/project.git
2013-10-14 13:27:39 +03:00
Dmitriy Zaporozhets
55327823c4
Added links to submodules
2013-10-14 13:27:32 +03:00
Marin Jankovski
9ed59ee9f0
Include project_id in webhook payload.
2013-10-14 12:03:25 +02:00
Dmitriy Zaporozhets
41f63acc84
Fix README detection for subdir
2013-10-13 16:03:16 +03:00
Dmitriy Zaporozhets
5c67c88731
Improve admin dashboard UX
2013-10-13 14:38:20 +03:00
Dmitriy Zaporozhets
b65a0461d1
Revert "Move warning about 0 ssh keys to bottom of page"
...
This reverts commit 20c47923a1 .
2013-10-13 14:22:40 +03:00
Dmitriy Zaporozhets
20c47923a1
Move warning about 0 ssh keys to bottom of page
2013-10-13 11:11:10 +03:00
Dmitriy Zaporozhets
70b793eb7a
Lighter border color for ui-box. Show closed keyword for issues list
2013-10-13 11:00:51 +03:00
Dmitriy Zaporozhets
995ce5fdc7
Fix 500 error on page with submodules
2013-10-12 10:01:27 +03:00
Dmitriy Zaporozhets
f81532b5b9
Merge branch 'permission-levels' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 13:02:30 +00:00
Dmitriy Zaporozhets
b883d94f96
Merge branch 'relative_links_in_documentation' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 13:00:05 +00:00
Sytse Sijbrandij
39c78b71c1
Add information about admin.
2013-10-11 12:15:18 +02:00
Dmitriy Zaporozhets
10fac47527
Merge branch 'wiki_backup' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 09:32:38 +00:00
Dmitriy Zaporozhets
9fa94cad56
Merge branch 'consistent-naming-of-user-and-profile-page' of /home/git/repositories/gitlab/gitlabhq
2013-10-11 09:32:12 +00:00
Sytse Sijbrandij
6cc3bb0f8f
Explain how group and project permissions interact.
2013-10-11 10:40:22 +02:00