Robert Schilling
3ee4701316
Add logrotate config to update docs
2013-10-18 15:22:23 +02:00
Marin Jankovski
728f0c2005
Add smtp settings override in smtp_settings sample file.
2013-10-18 09:49:55 +02:00
Dmitriy Zaporozhets
4f2c469946
Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhq
2013-10-18 07:14:39 +00:00
Marin Jankovski
1712406f8a
Add an example.
2013-10-18 09:11:37 +02:00
Dmitriy Zaporozhets
05ca0a3147
Merge branch 'refactor/gitlab_config_helper' of /home/git/repositories/gitlab/gitlabhq
2013-10-18 06:29:28 +00:00
David Pursehouse
873bd3ad2d
Capitalise "Awesome" in placeholder text
2013-10-18 13:29:39 +09:00
David Pursehouse
20ea670e67
Remove "is" from labels
2013-10-18 13:28:49 +09:00
David Pursehouse
42fbc91132
Correct date label on project information page
...
The label "Created at" would be appropriate for a timestamp such
as "09:30".
However the timestamp is actually being displayed as a date in
the format "Oct 15, 2013". In this case "Created on" is better.
2013-10-18 12:10:42 +09:00
Dmitriy Zaporozhets
2cd3d42181
Use gitlab_config intead of Gitlab.config.gitlab in views
2013-10-17 22:11:41 +03:00
Sytse Sijbrandij and Dmitriy Zaporozhets
164f9d8760
Add warning for issue visibility.
2013-10-17 17:33:57 +03:00
Dmitriy Zaporozhets
318f96a40d
Merge branch 'fix_sidekiq_process_count' of /home/git/repositories/gitlab/gitlabhq
2013-10-17 12:59:26 +00:00
Dmitriy Zaporozhets
2be2558c0c
Merge branch 'project_api_readme' of /home/git/repositories/gitlab/gitlabhq
2013-10-17 12:58:35 +00:00
Dmitriy Zaporozhets
ec337276c6
Merge branch 'issue_tracker' of /home/git/repositories/gitlab/gitlabhq
2013-10-17 12:58:15 +00:00
Marin Jankovski
7c3fd6941f
Update project api doc.
2013-10-17 12:16:57 +02:00
Jacob Vosmaer
73d19bb320
Count sidekiq processes using String#scan
...
It seems there is no easy way to count pattern occurences with
String#match.
2013-10-17 12:01:29 +02: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
13c192d44c
Version up to beta
2013-10-17 12:32:00 +03:00
Dmitriy Zaporozhets
a4de8f71c7
Minor UI improvement for ui-box-show
2013-10-17 12:31:49 +03:00
Dmitriy Zaporozhets
60e2a6563d
Add description to issues, projects in development fixtures
2013-10-17 12:27:09 +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
7b70d81c83
Speed up tests
2013-10-17 10:52:38 +03: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
Nihad Abbasov
e09cc195a7
fix variable name
2013-10-16 22:28:39 +05:00
Dmitriy Zaporozhets
6404d69780
Better UX for blocked users in admin area
2013-10-16 20:19:25 +03:00
Dmitriy Zaporozhets
e9142c6f2c
Merge branch 'grep_fix' of /home/git/repositories/gitlab/gitlabhq
2013-10-16 11:44:47 +00:00
Marin Jankovski
f3d77a7661
Add invert match to sidekiq match.
2013-10-16 13:39:09 +02:00
Dmitriy Zaporozhets
615d859f94
Merge branch 'logrotate' of /home/git/repositories/gitlab/gitlabhq
2013-10-16 10:08:53 +00:00
Dmitriy Zaporozhets
2c0f4c7664
Merge branch 'unicorn_rake_tasks' of /home/git/repositories/gitlab/gitlabhq
2013-10-16 09:31:17 +00:00
Dmitriy Zaporozhets
8f4fdd94d4
Merge branch 'sidekiq_admin_advice' of /home/git/repositories/gitlab/gitlabhq
2013-10-16 09:30:12 +00:00
Jacob Vosmaer
babba432f1
Use service gitlab reload to restart sidekiq
2013-10-16 10:47:10 +02:00
Jacob Vosmaer
d378332ff9
Add logrotate setup to the installation guide
2013-10-16 10:38:13 +02:00
Johannes Schleifenbaum
b4c85f0676
Print the configured GitLab user on the Admin-Sidekiq page
2013-10-16 09:05:52 +02:00
Johannes Schleifenbaum
5b0abbcbc3
Show only processes owned by the GitLab user on the Admin-Sidekiq page
...
See the Pull-Request #5191
2013-10-16 09:01:31 +02:00
Dmitriy Zaporozhets
253850dd6d
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2013-10-16 09:27:32 +03:00
Angus MacArthur
aefe2e952f
Fixing unsafe use of Thread.current variable :current_user
2013-10-16 01:20:53 -04:00
Jacob Vosmaer
6a7d63aa47
Move unicorn and sidekiq commands into bash script
2013-10-15 22:48:57 +02:00
Dmitriy Zaporozhets
7c4db532ff
Merge branch '6_0_update_troubleshooting' of /home/git/repositories/gitlab/gitlabhq
2013-10-15 17:20:36 +00:00
Dmitriy Zaporozhets
4649c6e3b1
Merge branch 'release-procedure' of /home/git/repositories/gitlab/gitlabhq
2013-10-15 17:19:35 +00: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
Jacob Vosmaer
c69b2856b1
Add troubleshooting info to 5.4-to-6.0.md
2013-10-15 14:58:26 +02:00
Jacob Vosmaer
a8eb525e72
Merge pull request #5168 from DirkR/master
...
Added description for Redis connection via unix socket
2013-10-15 05:44:06 -07:00
Marin Jankovski
4886d8fd03
Show sidekiq running processes in the background_jobs page.
2013-10-15 13:24:17 +02:00