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
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stan Hu 36bde0fcb1 Fix Error 500 when viewing user's personal projects from admin page 
This is a regression introduced in 4d7f00f.

Closes #3680
 2015-11-25 14:00:35 -08: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
Stan Hu e55473ad68 Expire application settings from cache at startup 
If a DB migration occurs, there's a chance that the application settings are
loaded from the cache and provide stale values, causing Error 500s.
This ensures that at startup the settings are always refreshed.

Closes #3643
 2015-11-25 11:30:33 -08: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
Valery Sizov 40ff1318d2 Rails update to 4.2.4 2015-11-25 18:18:44 +02:00
Marin Jankovski 5c0be319cc Remove some repetition in notify spec. 2015-11-25 13:59:03 +01:00
Marin Jankovski 5613592727 If action link is not found, return nil. 2015-11-25 13:53:02 +01: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
Marin Jankovski 7da750cc30 Specs for links in email notifications for Gmail Actions. 2015-11-25 13:27:31 +01:00
Laurens Stötzel 82ff9e6593 Correction of markdown in SSH docs 2015-11-25 12:27:07 +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 637e64c244 Clean up the Git protocol switcher JS 
Also re-adds the `.clone` updating that was removed accidentally.
Thanks, tests!
 2015-11-24 20:38:36 -05:00
Robert Speicher 1d80cd315e Add clipboard button to project clone panel 
Closes #3585
 2015-11-24 19:32:06 -05:00
Robert Speicher ec002e8026 Remove usage of Colored 2015-11-24 19:20:23 -05:00
Robert Speicher 7dab8ed739 Rework the copy_to_clipboard logic 
It needed to be more flexible in how we set the target text or element.
 2015-11-24 19:12:03 -05:00
Robert Speicher acc0f162c8 Move clipboard_button helper to ButtonHelper module 2015-11-24 16:55:26 -05:00
Robert Speicher af65046c5f Move HTTP/SSH clone button logic to helpers 2015-11-24 16:55:26 -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
Robert Speicher 776027e4c7 Bump gon to ~> 6.0.1 
Closes #2856
 2015-11-24 15:36:36 -05:00
Dmitriy Zaporozhets 0fb5ffd8b0 Merge branch 'fix-group-member' into 'master' 
Fix 500 error when update group member permission

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

Fixes #3578 

See merge request !1884
 2015-11-24 20:19:07 +00:00
Dmitriy Zaporozhets 6d5d45ada1 Merge branch 'issue_guidelines_with_omnibus_commands' into 'master' 
Spell out commands for omnibus-gitlab packages.

User got confused in gitlab-org/gitlab-ce#3614

See merge request !1881
 2015-11-24 18:10:06 +00:00
Dmitriy Zaporozhets cbaa33db8a Small code improvement 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-24 17:40:41 +01:00
Dmitriy Zaporozhets cb9f573818 Fix rubocop complain 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-24 16:17:11 +01:00
Dmitriy Zaporozhets 4caef63d82 Fix 500 error when update group member permission 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-24 16:13:21 +01:00
Marin Jankovski 0985032132 Also fallback to a default value if none is set. 2015-11-24 15:57:28 +01:00
Zeger-Jan van de Weg 2f127cb86b Merge branch 'master' into rake-tasks-git 2015-11-24 14:59:31 +01:00
Dmitriy Zaporozhets 9ab2e5f516 Merge branch 'fix-small-text' into 'master' 
Fix ultra-light color for small text

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

See merge request !1879
 2015-11-24 13:23:33 +00:00
Marin Jankovski 01bd7baf4f Spell out commands for omnibus-gitlab packages. 2015-11-24 12:21:11 +01:00
Marin Jankovski 9595ec036a Maybe rescue session_expire_delay by setting a default value. 2015-11-24 12:11:31 +01:00
Dmitriy Zaporozhets d1a7356398 Fix ultra-light color for small text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-24 11:36:53 +01:00