Dmitriy Zaporozhets
52a8e5c01a
Set group name from path in admin controller
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-22 13:55:32 +02:00
Dmitriy Zaporozhets
ed2bcf952b
Set group path during creation
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-22 13:50:58 +02:00
Dmitriy Zaporozhets
59bb635e0e
Set project path & name in one field without transforamtion
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-22 13:27:48 +02:00
Marin Jankovski
18d9172edc
Use a different name of the method to check if sanitize is enabled in check task.
2014-12-22 10:03:52 +01:00
Dmitriy Zaporozhets
55319c0a7a
Merge pull request #8474 from dblessing/feature/system_note_ui
...
Differentiate system notes
2014-12-21 13:38:53 +02:00
Robert Schilling
f7f56e4a0b
Merge pull request #8256 from cirosantilli/rm-unused-has_gitlab_shell3
...
Remove unused has_gitlab_shell3? method
2014-12-21 10:15:34 +01:00
Dmitriy Zaporozhets
e45e6ba2c3
Merge branch 'master' into sidebar-nav
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
app/views/layouts/group.html.haml
2014-12-21 01:20:51 +02:00
Dmitriy Zaporozhets
bcc04adb13
Css/views cleanup after layout restyle
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-21 01:11:08 +02:00
Dmitriy Zaporozhets
abd83baeab
Admin area using side nav
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-21 00:23:17 +02:00
Drew Blessing
a9761ac1b8
Differentiate system notes
2014-12-20 16:20:29 -06:00
Dmitriy Zaporozhets
0f7d47f695
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-12-20 20:20:39 +02:00
Dmitriy Zaporozhets
dc0879ac9e
Merge pull request #7882 from cirosantilli/blob-instance-to-local
...
Use blob local instead of instance.
2014-12-20 20:19:59 +02:00
Dmitriy Zaporozhets
e007d810c9
Merge pull request #7886 from cirosantilli/disable-blob-edit-mr
...
Disable / hide MR edit blob button if cannot edit.
2014-12-20 20:19:38 +02:00
Dmitriy Zaporozhets
5a7e3500e9
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-12-20 20:19:00 +02:00
Dmitriy Zaporozhets
8c1be08d9f
Merge pull request #8422 from gemnasium/update_gemnasiumm-gitlab-service
...
Update gemnasium-gitlab-service to version 0.2.3
2014-12-20 20:18:40 +02:00
Dmitriy Zaporozhets
223e509f70
Merge pull request #7894 from cirosantilli/fix-dev-user-seed
...
Fix dev user seed: ID was used twice.
2014-12-20 20:18:15 +02:00
Dmitriy Zaporozhets
6a5766e370
Merge pull request #7978 from cirosantilli/edit-preview-route-test
...
Add tests for tree edit routes
2014-12-20 20:17:25 +02:00
Dmitriy Zaporozhets
e37ecb7ea6
Merge pull request #8458 from kfei/docker/reduce-image-size
...
Reduce the size of Docker image
2014-12-20 20:16:48 +02:00
Dmitriy Zaporozhets
632da319bf
Merge pull request #8455 from kfei/docker/update-omnibus-package
...
Update the Omnibus package in Dockerfile
2014-12-20 20:16:17 +02:00
Dmitriy Zaporozhets
5aeb80537e
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-12-20 19:47:03 +02:00
Dmitriy Zaporozhets
a978673362
Merge pull request #8451 from skv-headless/transfer-error-handler
...
transfer error handler
2014-12-20 19:46:04 +02:00
Drew Blessing
3f13a0466f
Merge pull request #8469 from xperseguers/patch-1
...
[BUGFIX] Invalid branch in comparison
2014-12-20 09:25:56 -06:00
Jeroen van Baarsen
13104450cf
Merge pull request #8466 from cirosantilli/raketasks-doc
...
Fix Rake tasks doc README: add top level h1
2014-12-20 14:00:28 +01:00
Dmitriy Zaporozhets
b136976ab1
Merge pull request #8452 from dblessing/feature/theme_class
...
Add theme type css class
2014-12-19 22:28:18 +02:00
Xavier Perseguers
1e22b494e2
[BUGFIX] Invalid branch in comparison
2014-12-19 13:49:33 +01:00
Sytse Sijbrandij
549540f100
Merge branch 'omniauth-config-sample-link' into 'master'
...
Add link to OmniAuth config sample for Omnibus
Added a link to the OmniAuth config sample for Omnibus installations.
See merge request !1335
2014-12-18 19:16:32 +00:00
Dmitriy Zaporozhets
b667a45942
Restyle issue/mr/milestone to new layout
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-18 17:22:10 +02:00
Patricio Cano
6d747cfd3a
Added link to the configuration sample for OmniAuth providers when using Omnibus.
2014-12-18 09:50:20 -05:00
Job van der Voort
1524e2171a
Merge branch 'update-doc-7-6' into 'master'
...
Update Documentation for 7.6 release
Updated the update and install documentation for the 7.6 release.
See merge request !1334
2014-12-18 13:07:44 +00:00
Jacob Vosmaer
c8b2def2be
Add more comments explaining how we block IPs
2014-12-18 11:08:11 +01:00
Ciro Santilli
a55feb14f1
Fix Rake tasks doc README: add top level h1
...
and link to missing to features.md.
2014-12-18 09:22:34 +01:00
Patricio Cano
7813363fd7
Fixed version reference
2014-12-17 18:02:58 -05:00
Patricio Cano
918245094c
Added update guide for updating to 7.6
2014-12-17 18:00:43 -05:00
Dmitriy Zaporozhets
b87c9e289e
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
2014-12-17 14:09:26 +02:00
Dmitriy Zaporozhets
223c3e3b9e
Merge branch 'credentials-in-readme' into 'master'
...
Credentials in readme
See merge request !1332
2014-12-17 11:17:37 +00:00
Dmitriy Zaporozhets
c0d589dedb
Improve sidenav colors
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-17 13:10:58 +02:00
Dmitriy Zaporozhets
d6eda842a9
Sidenav for profile area
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-17 12:44:36 +02:00
Dmitriy Zaporozhets
51ee71d8e0
Migrate public layouts to new design
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-17 12:26:33 +02:00
Dmitriy Zaporozhets
eb2face2cb
Dashboard layout uses sidenav
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-17 12:20:05 +02:00
Sytse Sijbrandij
3f129fd618
Include default credentials in the readme and make all headers the same.
2014-12-17 11:07:10 +01:00
Dmitriy Zaporozhets
6ab9d678d7
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-12-17 11:51:27 +02:00
Dmitriy Zaporozhets
2fef5c1323
Merge branch 'dev-docs-in-gdk' into 'master'
...
Dev docs in gdk
Also see https://gitlab.com/gitlab-org/gitlab-development-kit/merge_requests/31
See merge request !1331
2014-12-17 09:49:10 +00:00
Jeroen van Baarsen
df32ad6c15
Merge pull request #8375 from bbodenmiller/process-fix
...
update order of upgrade guide
2014-12-17 09:37:07 +01:00
Sytse Sijbrandij
98e64610b2
Move development information to the GitLab Development Kit.
2014-12-17 08:27:03 +01:00
kfei
e9f974dc12
Reduce the size of Docker image
...
1) Add `--no-install-recommends` option to `apt-get install`, this
avoids lots of (~30MB) unnecessary packages.
2) Add `ca-certificates` package for `wget` fetching stuffs from Amazon
S3.
3) There is no need to run `apt-get clean` for an image derived from
official Ubuntu since they already cleaned (see also:
http://goo.gl/B2SQRB ) all the garbages produced by `apt-get`.
Signed-off-by: kfei <kfei@kfei.net >
2014-12-16 22:49:43 -08:00
kfei
c981d69338
Update the Omnibus package in Dockerfile
...
From 7.5.2 to 7.5.3.
Signed-off-by: kfei <kfei@kfei.net >
2014-12-16 09:04:52 -08:00
Dmitriy Zaporozhets
06a219baa5
Restyle group page and event filter
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-16 18:15:48 +02:00
Dmitriy Zaporozhets
fb7ba2deac
Merge branch 'update_gemfile_with_kerberos' into 'master'
...
Add kerberos to gemfile
See merge request !1330
2014-12-16 15:48:42 +00:00
Dmitriy Zaporozhets
f3f27fee88
Left-side navigation for group layout
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-16 16:58:15 +02:00
Valery Sizov
15303bbfd7
add kerberos to Gemfile
2014-12-16 13:57:40 +02:00