Commit Graph
449 Commits
Author SHA1 Message Date
Stephan van Leeuwen 23e83a6a99 Added changelog item 2014-12-29 16:41:50 +01:00
Dmitriy Zaporozhets 0d8118c68f Add mention notification level to CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-29 15:57:07 +02:00
Dmitriy Zaporozhets 3d3c7e743f Merge branch 'check_browser_version' of https://github.com/vicvega/gitlabhq into vicvega-check_browser_version
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	app/assets/stylesheets/generic/common.scss
2014-12-28 22:13:31 +02:00
Dmitriy Zaporozhets 25a42a56cf Merge pull request #8439 from glasspelican/Teamcity
Teamcity integration using 8.1 rest api
2014-12-28 22:11:29 +02:00
Dmitriy Zaporozhets b01c5d993c New CHANGELOG items
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-25 21:31:04 +02:00
Francesco Coda Zabetta 84b40a346a check browser version, blacklisting outdated IE (version < 10) 2014-12-24 16:22:08 +01:00
Jason Lippert 1fa19401e9 Teamcity interaction using 8.1 rest api 2014-12-23 12:38:25 -05:00
Dmitriy Zaporozhets bf69d18346 Initiate 7.7 CHANGELOG 2014-12-22 15:35:47 +00:00
Valery Sizov 842ac35ae4 Update changelog 2014-12-15 20:22:18 +02:00
Dmitriy Zaporozhets 2497273030 Update CHANGELOG with snippet validation change
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-12 16:35:05 +02:00
Dmitriy Zaporozhets 9c9dc64a40 Update CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-11 13:26:34 +02:00
Dmitriy Zaporozhets 1812c1d4de Merge branch 'improved-monokai' into 'master'
Improve Monokai highlight style to match original

The current monokai style is not very true to the original and lacks colors for certain syntactic items as mentioned in ticket https://github.com/gitlabhq/gitlabhq/issues/6855. This change's goal is to bring the monokai highlight style in line with the original design from http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/

Before:
![monokai-old](https://gitlab.com/uploads/klowner/gitlab-ce/ce96c7d7c2/monokai-old.png)

After:
![monokai](https://gitlab.com/uploads/klowner/gitlab-ce/b257a8143a/monokai.png)

See merge request !238
2014-12-07 13:34:37 +00:00
Dmitriy Zaporozhets 2a494d99fa Update CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 18:30:50 +02:00
Dmitriy Zaporozhets a46fe875c6 Feature: atom feed for user activity
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-04 21:49:19 +02:00
Jacob Vosmaer 18164afbcc Update Sidekiq to 2.17.8 2014-12-04 18:11:49 +01:00
Sytse Sijbrandij c0a0d46c97 Add docker container to changelog. 2014-12-03 12:51:17 +01:00
Dmitriy Zaporozhets 6532043697 Merge branch 'disable_arguments_logger' into 'master'
Disable Sidekiq arguments logging by default

Some of the arguments passed to Sidekiq jobs are secret. With this
change we avoid logging those secrets, by turning off 'argument
logging' altogether.

See merge request !1282
2014-12-02 10:47:40 +00:00
Dmitriy Zaporozhets bf39347970 Merge branch 'larger-avatar'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-12-02 12:44:18 +02:00
Sytse Sijbrandij 8f60144782 Change avatar file size to 200kb. 2014-12-02 10:32:24 +01:00
Dmitriy Zaporozhets 5b92ddb809 Mention mobile UI improvements in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 08:30:56 +02:00
Jacob Vosmaer 6491974554 Disable Sidekiq arguments logging by default 2014-12-01 18:58:37 +01:00
Mark Riedesel 9a8ffadc39 Improve Monokai highlight style to match original
The current monokai style in highlightjs is not very true to the
original and lacks colors for certain syntactic items. This change's
goal is to bring the highlightjs monokai style in line with the original
design from http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
2014-12-01 10:31:43 -06:00
Dmitriy Zaporozhets 31f7560332 Update CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-30 15:25:17 +02:00
Dmitriy Zaporozhets 28a95f1292 Merge branch 'restore_wikis' into 'master'
Fix wiki restore

Seems 4a5044e302 only fixed git repos restore. This MR provides the same functionality that was introduced in the aforementioned commit, but for wikis.

See merge request !247
2014-11-30 12:11:11 +00:00
Dmitriy Zaporozhets f7d8467af9 Update CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-30 00:52:04 +02:00
Achilleas Pipinellis 880478b21e Proper wiki restore. Fixes #845 2014-11-29 22:01:52 +02:00
Jacob Vosmaer 64ab6c9ed5 Add 'MemoryKiller' Sidekiq middleware
When enabled, this middleware allows Sidekiq to detect that its RSS has
exceeded a maximum value, triggering a graceful shutdown. This
middleware should be combined with external process supervision that
will restart Sidekiq after the graceful shutdown, such as Runit.
2014-11-28 15:01:41 +01:00
Valery Sizov 5f7574cf05 Merge branch 'backup-cron-mode' into 'master'
Backup cron mode

If you have your server configured to receive emails containing the output of
cron jobs it is annoying to get long spammy emails from the backup script. This
change adds a 'cron mode' that makes the backup script silent unless something
goes wrong during the backup.

See merge request !1268
2014-11-24 09:33:39 +00:00
Jacob Vosmaer 4053c055be Add missing timestamps to the 'members' table 2014-11-21 15:02:23 +01:00
Jacob Vosmaer 7c54c63ac1 Add CRON=1 backup setting for quiet backups 2014-11-20 15:46:04 +01:00
Dmitriy Zaporozhets fe46a5c084 Start 7.6.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-18 18:44:12 +02:00
Dmitriy Zaporozhets a4e98f0ec9 Merge branch 'fork-to-group' into 'master'
Fork to group

Fixes #1592

* project can be forked into group
* fork link always lead to fork page where you select namespace where to fork

See merge request !1253
2014-11-18 10:44:15 +00:00
Dmitriy Zaporozhets e37461979a Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-11-17 17:56:07 +02:00
Valery Sizov 214f6985a8 Update changelog 2014-11-17 11:03:03 +00:00
Ben Bodenmiller 987007b8db remove duplicate time zone entry in CHANGELOG 2014-11-15 02:17:01 -08:00
Dmitriy Zaporozhets 75c3dc9efc Merge branch 'sidekiq_gc_start' into 'master'
Run 'GC.start' after every EmailsOnPushWorker job

This change removed a lot of large peaks of the Sidekiq memory growth graph on gitlab.com.

See merge request !1257
2014-11-14 14:48:30 +00:00
Jacob Vosmaer c10f61802b Run 'GC.start' after every EmailsOnPushWorker job 2014-11-14 12:22:22 +01:00
Dmitriy Zaporozhets 58011d61c3 Merge branch 'prepare-fork-to-given-namespace' of https://gitlab.com/bkaindl/gitlab-ce into bkaindl/gitlab-ce-prepare-fork-to-given-namespace 2014-11-13 19:36:28 +02:00
Dmitriy Zaporozhets 5e9f6562bb Update CHANGELOG for 7.5
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-13 19:20:35 +02:00
Dmitriy Zaporozhets 9a96a8270b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-11-12 13:20:01 +02:00
Dmitriy Zaporozhets 940ed58e76 Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into jeroenj/gitlab-ce-commit-comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-11-12 13:19:35 +02:00
Valery Sizov 1a7e347635 Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequences
Conflicts:
	CHANGELOG
2014-11-12 13:14:13 +02:00
Valery Sizov 1aa34f14ae Merge branch '7-4-stable'
Conflicts:
	CHANGELOG
	VERSION
2014-11-11 11:40:14 +02:00
Ben Bodenmiller 6ace931c35 make repo name link to repo homepage 2014-11-09 03:37:56 -08:00
Dmitriy Zaporozhets e1c48f1431 Merge branch 'master' into jastkand/gitlab-ce-fix-api-auth
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-11-03 14:10:53 +02:00
Dmitriy Zaporozhets 9b251bd1cc Update changelog
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-31 12:10:19 +02:00
Andrey KrivkoandDmitriy Zaporozhets bafd30f92c Session API: Use case-insensitive authentication like in UI 2014-10-30 18:29:18 +02:00
Dmitriy Zaporozhets f0dd16d53e Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-10-30 16:17:36 +02:00
Sean Edge 822d9aa6ba Create RepoTag Grape entity and present it when doing stuff with tags via API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags. 2014-10-30 09:48:23 -04:00
Jacob Vosmaer 8146271d40 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup_restore_drop_sequences
Conflicts:
	CHANGELOG
2014-10-30 14:41:16 +01:00