home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,295 Commits 48 Branches 340 Tags
593a287c8d0cfcc22ca2db35dc9a72140e296c2e
Commit Graph
6087 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ee068e76f3 Merge pull request #7961 from cirosantilli/dry-log-file-names 
Factor admin logs [failure unrelated]
 2014-10-21 11:59:41 +03:00
Dmitriy Zaporozhets c36a9e4cbf Merge pull request #8029 from cirosantilli/rm-projects-controller-filter 
Remove unused filter from ProjectsController
 2014-10-21 11:58:08 +03:00
Dmitriy Zaporozhets 1657750a6a Merge pull request #8028 from cirosantilli/rm-dev-tools 
Remove unused dev_tools helper.
 2014-10-21 11:55:36 +03:00
Dmitriy Zaporozhets c3b81e5f40 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-21 11:44:18 +03:00
Dmitriy Zaporozhets 8ad9a75f88 Merge pull request #8030 from cirosantilli/factor-authorize 
Factor authorize_push! and authorize_code_access!
 2014-10-21 11:43:12 +03:00
Dmitriy Zaporozhets 5ce9f89c7b Merge pull request #8102 from cirosantilli/use-memoized-project 
Use @project on controllers, don't call method
 2014-10-21 11:41:03 +03:00
Dmitriy Zaporozhets 456de99b9b Merge pull request #8101 from cirosantilli/rm-project-id-admin-project-controller 
Remove param[:project_id] at admin controller
 2014-10-21 11:40:46 +03:00
Dmitriy Zaporozhets fb5c1dd8f0 Merge pull request #8113 from cirosantilli/factor-group-forms 
Factor group forms
 2014-10-21 11:39:41 +03:00
Dmitriy Zaporozhets d545bb8de4 Merge pull request #8097 from cirosantilli/dry-mentioned-in 
DRY mentioned in magic note constant
 2014-10-21 11:39:02 +03:00
Robert Schilling ad774c2017 Merge pull request #8110 from cirosantilli/coffee-uniform-export 
Export all coffee classes with @
 2014-10-21 09:11:58 +02:00
Robert Schilling 11656fd423 Merge pull request #8111 from cirosantilli/dry-group-avatar-button 
Factor choose group avatar button
 2014-10-21 08:25:09 +02:00
Ciro Santilli 3a47ed979a Factor group forms 2014-10-21 00:25:44 +02:00
Ciro Santilli 01db264ffc Factor choose group avatar button 2014-10-20 23:57:46 +02:00
Ciro Santilli f7d01f2067 Factor group tips 2014-10-20 23:43:51 +02:00
Ciro Santilli c0c8dccf2e Export all coffee classes with @ 2014-10-20 23:03:33 +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
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 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
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
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
Sytse Sijbrandij 6cff68fb30 Link to trending public projects so more relevant projects are shown to new users. 2014-10-17 16:27:44 +02:00
Dmitriy Zaporozhets 966f68b33e Refactor error message a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-17 13:15:59 +03:00
Jan-Willem van der Meer d9bfebc0e8 Add regressiontest to verify allow_single_sign_on setting 
verification for #1677

Since testing omniauth_callback_controller.rb is very difficult, the logic
is moved to the models
 2014-10-16 20:08:30 +02:00
Jan-Willem van der Meer 92c184a57f Disallow new users from Oauth signup if allow_single_sign_on is disabled 
Because devise will trigger a save, allowing unsaved users to login, behaviour had changed.
The current implementation returns a pre-build user, which can be saved without errors.

Reported in #1677
 2014-10-16 11:46:40 +02:00
Dmitriy Zaporozhets c926922ade Show merge in progress message if MR is locked 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-15 15:52:39 +03:00
Dmitriy Zaporozhets 381a6283a9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-15 15:35:08 +03:00
Dmitriy Zaporozhets 67a28cea30 Merge pull request #8048 from skv-headless/master 
same rendering for note diff as for usual diff
 2014-10-15 15:15:40 +03:00
Marin Jankovski 76cde5c0e5 Add links to the migration doc, make it clear import is only for git repos. 2014-10-15 13:13:42 +02:00
Dmitriy Zaporozhets 19b0ba5ecb Merge branch 'fix-star-icon' into 'master' 
Fix star icon

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/682.

See merge request !1180
 2014-10-15 09:36:19 +00:00
Dmitriy Zaporozhets c31d9b73d7 Merge branch 'improve-mr-widgets' into 'master' 
Improve MR widgets

Before:

![Screenshot 2014-10-14 17.49.03](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/0283aa379e/Screenshot_2014-10-14_17.49.03.png)

After:

![Screenshot 2014-10-14 17.48.58](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/ca9f2bae19/Screenshot_2014-10-14_17.48.58.png)

See merge request !1178
 2014-10-15 09:32:52 +00:00
Evgeniy Sokovikov 732e6c3dbb same rendering for note diff as for usual diff 2014-10-15 13:03:27 +04:00
Dmitriy Zaporozhets e3bd17a7ba Merge branch 'feature-multiple-ldap-servers' into 'master' 
Feature multiple ldap servers

Update the code so Gitlab-EE can support multiple LDAP servers

See merge request !1172
 2014-10-14 15:01:37 +00:00
Dmitriy Zaporozhets 0d30b13a7a Move "modify merge message link" to the right to prevent accidently hiting accept button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-14 17:48:32 +03:00
Dmitriy Zaporozhets 706ee232c5 Make accept MR widget looks similar to panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-14 17:47:31 +03:00
Dmitriy Zaporozhets 3c66490e6f Use stars icon on explore->starred page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-14 16:46:50 +03:00
Jan-Willem van der Meer 6ce65a3e95 Use Hash syntax for LDAP server declaration 2014-10-14 13:13:59 +02:00
Marin Jankovski f174800b20 Different wording for notification note. 2014-10-14 12:28:30 +02:00
Marin Jankovski 920eb7abc4 Add a note about notification for a project. 2014-10-14 12:02:05 +02:00
Jan-Willem van der Meer fc5bfd1dc1 Move dynamic omniauth declarations to initializer 2014-10-14 09:31:06 +02:00
Ciro Santilli 4d0d5e79ba Factor authorize_push! and authorize_code_access! 
with existing method_missing. Pattern already used extensively,
so let's be consistent and use it everywhere.
 2014-10-13 21:31:49 +02:00
Ciro Santilli a22d4cebb0 Remove unused filter from ProjectsController 
Neither controller nor any of it's descendants have those actions.
 2014-10-13 21:24:42 +02:00
Ciro Santilli c278520f9b Remove unused dev_tools helper. 2014-10-13 21:21:58 +02:00
Ciro Santilli 2d23522107 Use :message key, not :error for File::Service. 2014-10-13 20:55:09 +02:00