home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ciro Santilli c0c8dccf2e Export all coffee classes with @ 2014-10-20 23:03:33 +02:00
Dmitriy Zaporozhets 3f4cfd362d Merge branch 'fix-500-admin-projects' into 'master' 
Fix 500 error when filtering projects in admin interface

Fixes #1693

See merge request !1200
 2014-10-20 17:05:35 +00:00
Valery Sizov a54d5dc776 Merge branch 'fixes-from-master' into '7-4-stable' 
Fixes from master

It includes:

* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1193
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1196
* https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1195

See merge request !1198
 2014-10-20 16:38:23 +00:00
Jacob Vosmaer b1b6761e05 Add LDAP configuration documentation 2014-10-20 16:41:37 +02:00
Jacob Vosmaer 46cdb931d8 Remove legacy LDAP configuration examples 2014-10-20 16:41:28 +02:00
Dmitriy Zaporozhets 5ed7c20150 Prevent 500 error when filter projects with push in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 17:22:39 +03:00
Jacob Vosmaer 0b78bd7a42 Keep the legacy LDAP syntax in the documentation 2014-10-20 16:22:36 +02:00
Jacob Vosmaer 1768e3eccb Update the documentation for the LDAP user filter 2014-10-20 16:18:45 +02:00
Jan-Willem van der MeerandDmitriy Zaporozhets 3d3726a026 Default the LDAP server label to LDAP 2014-10-20 16:38:08 +03:00
Jan-Willem van der MeerandDmitriy Zaporozhets 49bd981200 Prevent redeclaration of LDAP strategy 2014-10-20 16:38:07 +03:00
Dmitriy Zaporozhets 644fd232db Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 16:37:52 +03:00
Dmitriy Zaporozhets ebc0a7050a Fix group user removal from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 16:37:52 +03:00
Jacob VosmaerandDmitriy Zaporozhets 082d59d21f Ask the wiki repo, not Gollum, if it's empty 
We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.
 2014-10-20 16:37:20 +03:00
Dmitriy Zaporozhets 72abe9f679 Merge branch 'fix-group-member-remove' into 'master' 
Fix group member remove

Fixes https://github.com/gitlabhq/gitlabhq/issues/8090.

See merge request !1196
 2014-10-20 12:44:07 +00:00
Dmitriy Zaporozhets 44e6b80271 Merge branch 'empty_wiki_backup_check' into 'master' 
Empty wiki backup check

We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.

See merge request !1195
 2014-10-20 12:20:29 +00:00
Dmitriy Zaporozhets c0a5d04381 7.5.0 started 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 13:51:02 +03:00
Dmitriy Zaporozhets ab2db486b8 Merge branch 'security-api-internal-publicity' into 'master' 
Gitlab-shell identification

Part of gitlab/gitlabhq#1528

See merge request !1185
 2014-10-20 10:47:43 +00:00
Dmitriy Zaporozhets 2064a14724 Add tests for remove group member feature in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 13:18:07 +03:00
Dmitriy Zaporozhets f50c0e5af1 Fix group user removal from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-20 12:59:16 +03:00
Dmitriy Zaporozhets d4bc125581 Merge pull request #7856 from cirosantilli/error-to-msg 
Fix missing flash on file edit error from web UI.
 2014-10-20 12:52:17 +03:00
Dmitriy Zaporozhets d7ec8451dc Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-20 12:40:43 +03:00
Dmitriy Zaporozhets c4d487a7ef Merge branch 'ldap-fixes' into 'master' 
Ldap fixes

Solves #1688 and #1686

See merge request !1193
 2014-10-20 09:38:40 +00:00
Jacob Vosmaer 8ad1330b6a Ask the wiki repo, not Gollum, if it's empty 
We need to skip empty repositories when creating a backup. Before this
change, we were asking gollum-lib if the wiki contains any _pages_. Now
we ask gitlab_git if the repository contains _files_. This should
resolve gollum_lib Grit timeouts in the backup script.
 2014-10-20 10:52:29 +02:00
Robert Schilling 489d9cdaab Merge pull request #8017 from mr-vinn/md-table-doc 
Document Markdown table formatting issue
 2014-10-20 07:49:51 +02:00
Ciro Santilli 9e1b97ad99 Use @project on controllers, don't call method 
Also memoize the method to ensure that other methods in
ApplicationController that rely on it can call it efficiently.
 2014-10-19 23:36:23 +02:00
Ciro Santilli 6a73b76c5f Remove param[:project_id] at admin controller 
The route never passes that parameter to the helpers.
 2014-10-19 23:02:19 +02:00
Ciro Santilli f808ecf11e DRY mentioned in magic note constant 2014-10-19 22:19:56 +02:00
Ciro Santilli b011052ce7 Remove unused authenticate_user from project#show 
Redundant with the authorize_read_project! filter
 2014-10-19 11:46:57 +02:00
Ciro Santilli b66a152735 Factor abilities methods 
in app controller, user model and services.
 2014-10-19 11:12:39 +02:00
Vinnie Okada 5bb8aff5dd Fix more Markdown preview tests 2014-10-18 18:43:45 -05:00
Vinnie Okada 74c82ae325 Fix houndci warnings 2014-10-18 18:24:12 -05:00
Vinnie Okada f9e423b499 Fix long line in view 2014-10-18 18:16:20 -05:00
Vinnie Okada de53bc9d84 Add new Markdown preview test 
Add a test to make sure that Markdown previews are available when
editing an existing issue.
 2014-10-18 18:07:46 -05:00
Vinnie Okada e06f0ead98 Fix Markdown preview tests 
Update Spinach tests for Markdown previews for the new-ish tab UI that
replaced the old preview/edit toggle button.
 2014-10-18 18:07:23 -05:00
Vinnie Okada e1491465de Refactor Markdown preview tests 
Create a new shared module for common issue/merge request behavior,
use `expect` syntax instead of `should`, and avoid `visible: false` in
the `have_css` matcher.
 2014-10-18 17:58:34 -05:00
Ciro Santilli a3623a9691 Use argument list for sh instead of string 
Faster, more portable and less error prone since no shell expansion.
 2014-10-18 22:49:56 +02:00
Ciro Santilli 2901042196 Replace match with end_with: more readable, faster 2014-10-18 22:41:39 +02:00
Ben Bodenmiller 4880b91ff1 add optimizations for mysql to 6.x->7.4 guide 
Add mysql optimizations from 7.3-to-7.4.md.
 2014-10-18 02:13:15 -07:00
Ben Bodenmiller 0ff6105589 add missing configure Redis to use sockets 
Add details from 7.2-to-7.3.md. Replaces https://github.com/gitlabhq/gitlabhq/pull/8047.
 2014-10-18 02:08:01 -07:00
Ben Bodenmiller 3e6b284bd0 stop gitlab before backup 2014-10-18 01:51:35 -07:00
Ben Bodenmiller 9a92e53f62 stop gitlab before backup 
Stopping gitlab before backup ensures that backup has everything before upgrade incase something goes wrong. Also remove extra cd.
 2014-10-18 01:49:59 -07:00
Ben Bodenmiller 76e2ae8148 actually give command necessary to update unicorn 
Give command to update unicorn.rb rather than just say you need to do it.
 2014-10-18 01:39:01 -07:00
Ben Bodenmiller 35b1a036d7 stop gitlab before mysql optimizations, run checks 
Update MySQL optimizations to reflect doing updates after GitLab has already been started back up.
 2014-10-18 01:33:51 -07:00
Ben Bodenmiller 768da57fe4 clarify when database.yml needs to be updated 
Clarify that database.yml should be updated if you are running a MySQL Database. Remove wording that de-emphasises importance of update.
 2014-10-18 01:28:50 -07:00
Robert Schilling 3880bb6176 Merge pull request #8058 from bbodenmiller/patch-14 
simplify DHE parameter generation
 2014-10-18 09:32:30 +02:00
Vinnie Okada f2764e566e Use actual GitLab URL for test assertion 
Assert the full GitLab root URL, including the port, instead of using a
regexp to tolerate whatever port is returned.
 2014-10-18 00:04:21 -05:00
Dmitriy Zaporozhets c5360a588d Merge branch 'link-to-trending-projects-instead-of-all' into 'master' 
Link to trending projects instead of all

See merge request !1192
 2014-10-17 20:18:34 +00:00
Dmitriy Zaporozhets fa57efa1b8 Merge branch 'improve-ci-widgets' into 'master' 
Minor improvement of CI widgets UI

Before:

![Screenshot 2014-10-17 20.20.14](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/4770ae1223/Screenshot_2014-10-17_20.20.14.png)

After:

![Screenshot 2014-10-17 20.20.19](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/76018ef7f7/Screenshot_2014-10-17_20.20.19.png)

See merge request !1194
 2014-10-17 20:18:00 +00:00
Dmitriy Zaporozhets 9e6e0171ce Increase participants block margin 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 20:41:27 +03:00
Dmitriy Zaporozhets 6797c59e6e Improve visual detection of CI status 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 20:27:30 +03:00