home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,822 Commits 48 Branches 340 Tags
bb6ce2bb10734cfc45e488378acaa17000fdacc2
Commit Graph
20822 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis bb6ce2bb10 Test using a 1.9.8 phantomjs version built with fpm 
https://gitlab.com/axil/phantomjs-debian
 2015-11-29 13:44:19 +02:00
Achilleas Pipinellis 7d6323a9d4 Update phantomjs to 2.0.0 
* Version 1.9 was removed from upstream Debian repos
 2015-11-29 11:51:02 +02:00
Achilleas Pipinellis 15291c8974 Merge branch 'remove-satellites-reference' into 'master' 
Remove reverence to satellites

Remove reference in backup docs

See merge request !1923
 2015-11-28 22:20:26 +00:00
Robert Schilling 85ad2140fa Remove reverence to satellites [ci skip] 2015-11-28 20:53:17 +01:00
Sytse Sijbrandij db1fe56a0e Merge branch 'doc_public_access' into 'master' 
Update public access documentation



See merge request !1837
 2015-11-28 07:08:17 +00:00
Robert Speicher 3c2914b486 Merge branch 'nginx-workhorse-upload-limit' into 'master' 
Nginx workhorse upload limit

See merge request !1919
 2015-11-27 19:41:02 +00:00
Robert Speicher f1710073b4 Fix alignment 
[ci skip]
 2015-11-27 14:39:55 -05:00
Jacob Vosmaer 04049b6b17 Fix indentation in NGINX config 2015-11-27 13:57:53 +01:00
Jacob Vosmaer 295d378e9a Repeat "client_max_body_size 0" everywhere 
It turns out that if we do not the declaration from
"location /" wins.
 2015-11-27 13:56:26 +01:00
Douwe Maan 8f4b6d51f0 Merge branch 'jcorcuera/gitlab-ce-issue_3428' 2015-11-27 12:53:10 +01:00
Stan Hu 312e3b1e16 Merge branch 'master' of https://github.com/gitlabhq/gitlabhq 2015-11-26 08:14:10 -08:00
Stan Hu 2f90e71fd3 Merge pull request #9670 from janten/gravatar-retina 
Add support for HiDPI displays in gravatar service
 2015-11-26 08:13:28 -08:00
Jose Corcuera b9df1a6355 Strip attributes for Milestone and Issuable. #3428 2015-11-26 10:16:50 -05:00
Douwe Maan 68a4533818 Merge branch 'rs-markdown-preview' into 'master' 
Decouple Markdown previews from DropzoneInput



See merge request !1908
 2015-11-26 13:05:25 +00:00
Douwe Maan c887045cd2 Merge branch 'dbalexandre/gitlab-ce-fix-raw-personal-snippet-access-workflow' 2015-11-26 14:03:51 +01:00
Dmitriy Zaporozhets 1befbbf57d Merge branch 'rs-remove-enumerize' into 'master' 
Remove enumerize gem

Closes #2803 

See merge request !1912
 2015-11-26 09:03:04 +00:00
Dmitriy Zaporozhets 21003c0cb2 Merge branch 'rs-update-asana' into 'master' 
Bump asana to ~> 0.4.0

Closes #2830

See merge request !1911
 2015-11-26 09:01:52 +00:00
Dmitriy Zaporozhets b501ce0438 Merge branch 'rs-update-doorkeeper' into 'master' 
Bump doorkeeper to ~> 2.2.0

Closes #2746

See merge request !1910
 2015-11-26 09:01:23 +00:00
Stan Hu 1a8d4ded19 Merge branch 'fix-dup-changelog-entry' into 'master' 
Remove duplicate CHANGELOG entry shipped in 8.1.4



See merge request !1914
 2015-11-26 01:07:47 +00:00
Stan Hu 7adfb30c34 Remove duplicate entry shipped in 8.1.4 2015-11-25 17:06:36 -08:00
Dmitriy Zaporozhets 6bc38b9c8f Merge branch 'rs-rescueexception-cop' into 'master' 
Enable the Lint/RescueException cop



See merge request !1894
 2015-11-26 00:34:26 +00:00
Robert Speicher 5f0d1f30b0 Remove enumerize gem 2015-11-25 17:06:04 -05:00
Robert Speicher 91c0aa5e98 Bump asana to ~> 0.4.0 
Closes #2830
 2015-11-25 17:03:30 -05:00
Robert Speicher 59cc61e246 Bump doorkeeper to ~> 2.2.0 
Closes #2746
 2015-11-25 17:01:02 -05:00
Robert Speicher 73eca2a95e Decouple Markdown previews from DropzoneInput 2015-11-25 16:36:04 -05:00
Douglas Barbosa Alexandre 8dcef120cd Fix raw private snippets access workflow 2015-11-25 18:16:27 -02:00
Dmitriy Zaporozhets dee28c50a9 Merge branch 'new-member-page' into 'master' 
Improve group and project members pages

* Improve UI for group members page
* Improve UI for project members page

For internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2057

This MR should solve usability problem with adding new member to group/project 

See merge request !1886
 2015-11-25 18:20:22 +00:00
Dmitriy Zaporozhets 913b408c02 Merge branch 'bump-gitlab-shell' into 'master' 
Bump gitlab-shell to 2.6.8

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For gitlab/gitlabhq#2635

See merge request !1939
 2015-11-25 12:52:41 +00:00
Dmitriy Zaporozhets 18a5f91ed6 Bump gitlab-shell to 2.6.8 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 13:08:47 +01:00
Yorick Peterse ef2bc0f0bf Merge branch 'sherlock-total-query-time' into 'master' 
Added total query time to Sherlock

This makes it easier to see if a problem is caused by slow queries or
slow Ruby code (unrelated to any SQL queries that might be used).

See merge request !1887
 2015-11-25 11:29:48 +00:00
Dmitriy Zaporozhets acad9d67c7 Fix rubocop complain 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 12:27:34 +01:00
Dmitriy Zaporozhets d262daa4f0 Split group feature tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 11:44:39 +01:00
Dmitriy Zaporozhets 561634c78f Refactor group steps 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00
Dmitriy Zaporozhets ea7467d2be Refactor group members tests a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00
Dmitriy Zaporozhets 34cc8f4a60 Improve project members page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00
Dmitriy Zaporozhets d9749c8d36 Improve UI for group members page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00
Robert Schilling 4cfc3df534 Merge branch 'lfs-doc' into 'master' 
Add reference to Microsoft's Git Credential Manager for Windows.

Minor update to the LFS-documentation, referencing Microsoft's Git Credential Manager for Windows.

See merge request !1892
 2015-11-25 09:05:31 +00:00
Dmitriy Zaporozhets 3fd885fd91 Merge branch 'rs-update-colorize' into 'master' 
Bump colorize to ~> 0.7.0

Also removes `colored` which came in during the CI merge and is
redundant.

Closes #2822

See merge request !1895
 2015-11-25 09:02:06 +00:00
Dmitriy Zaporozhets 85d537ac73 Merge branch 'rs-update-rack-oauth2' into 'master' 
Bump rack-oauth2 to ~> 1.2.1

Closes #2748

See merge request !1891
 2015-11-25 09:01:12 +00:00
Dmitriy Zaporozhets cbdccf66bf Merge branch 'rs-update-creole' into 'master' 
Bump creole to ~> 0.5.0

Closes #2815

See merge request !1890
 2015-11-25 09:00:38 +00:00
Dmitriy Zaporozhets 1c8fa3b255 Merge branch 'rs-update-gon' into 'master' 
Bump gon to ~> 6.0.1

Closes #2856

See merge request !1889
 2015-11-25 09:00:10 +00:00
Robert Speicher 5288fbe4eb Merge branch 'session_expire_delay_cannot_be_nil' into 'master' 
Maybe rescue session_expire_delay by setting a default value.

Related to gitlab-org/omnibus-gitlab#956

See merge request !1880
 2015-11-25 02:27:27 +00:00
Robert Speicher 767bd6f882 Enable the Lint/RescueException cop 2015-11-24 20:55:09 -05:00
Robert Speicher 9a4ae85948 Merge branch 'rs-rescue-standarderror' into 'master' 
Rescue StandardError, not Exception

See merge request !1893
 2015-11-25 01:52:22 +00:00
Robert Speicher ec002e8026 Remove usage of Colored 2015-11-24 19:20:23 -05:00
Robert Speicher 28de6770fa Bump colorize to ~> 0.7.0 
Also removes `colored` which came in during the CI merge and is
redundant.

Closes #2822
 2015-11-24 16:29:21 -05:00
Robert Speicher a2915aeb66 Rescue StandardError, not Exception 2015-11-24 16:12:25 -05:00
Eirik Lygre b982827812 Add reference to Microsoft's Git Credential Manager for Windows. 2015-11-24 20:55:18 +00:00
Robert Speicher 446a95d307 Bump rack-oauth2 to ~> 1.2.1 2015-11-24 15:48:49 -05:00
Robert Speicher 26f9dbf8a9 Bump creole to ~> 0.5.0 
Closes #2815
 2015-11-24 15:42:42 -05:00