home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,939 Commits 48 Branches 340 Tags
v7.9.2
Commit Graph
14939 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets c46d4f5465 Version 7.9.2 v7.9.2 2015-04-01 17:57:10 -07:00
Dmitriy Zaporozhets 6f6c5f18a0 Version 7.9.1 v7.9.1 2015-03-25 15:42:30 -07:00
Dmitriy Zaporozhets 361b495e0e Merge branch 'release/7.9.1' into '7-9-stable' 
WIP | Release 7.9.1

See merge request !1738
 2015-03-25 15:59:08 +00:00
Dmitriy ZaporozhetsandMarin Jankovski b68f9beffe Merge branch 'milestone_and_labels_links' into 'master' 
Milestones and labels can be used even when issues are disabled.

When Issues are disabled for a project Milestones and Labels can still be used for Merge Requests.

See merge request !1739
 2015-03-24 18:15:22 -07:00
Marin Jankovski c91162c53e Update changelog. 2015-03-24 15:05:30 -07:00
Dmitriy ZaporozhetsandMarin Jankovski b6a5a46163 Merge branch 'no-comment-bubble' into 'master' 
Don't show commit comment button when user is not signed in.

Address private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2167.

See merge request !429
 2015-03-24 12:56:42 -07:00
Douwe MaanandMarin Jankovski b6f1f5e3b4 Revert "Update gemnasium-gitlab-service gem" 
This reverts commit af522ede14.
 2015-03-24 12:55:57 -07:00
Douwe MaanandMarin Jankovski 8a61111410 Merge pull request #9001 from vichak/master 
Fix #8966 Remove Milestones/Labels from project navbar when Issues disabled
 2015-03-24 12:55:30 -07:00
Douwe MaanandMarin Jankovski 1b23122f99 Merge branch 'fix-admin-service-template-config' into 'master' 
Include missing events and fix save functionality in admin service template settings form

### What does this MR do?

This MR includes missing settings left out in the Admin -> Service Templates page and fixes the inability to save certain settings.

### Are there points in the code the reviewer needs to double check?

No.

### Why was this MR needed?

Because the service template form was broken and untested.

### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?

#1275

Before:

![Screen_Shot_2015-03-23_at_5.53.19_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/e1bff75f30a3b6ecb174d3e25c722b7e/Screen_Shot_2015-03-23_at_5.53.19_AM.png)

After:

![Screen_Shot_2015-03-23_at_5.53.13_AM](https://gitlab.com/stanhu/gitlab-ce/uploads/8fada00128a3d0951b3230fefa64be92/Screen_Shot_2015-03-23_at_5.53.13_AM.png)

See merge request !427
 2015-03-24 12:54:24 -07:00
Dmitriy ZaporozhetsandMarin Jankovski cd26d79ca4 Merge branch 'fix-import-from-modal' into 'master' 
Fix "Import projects from" button to show the correct instructions

Closes #1267

See merge request !422

Conflicts:
	app/views/projects/new.html.haml
 2015-03-24 12:44:14 -07:00
Dmitriy ZaporozhetsandMarin Jankovski 325cedebe3 Merge branch 'fix-broken-new-project-import' into 'master' 
Fix OAuth2 issue importing a new project from GitHub and GitLab

It appears that the GitLab OAuth2 client options were converted to strings instead of symbols when merged with the default options (i.e. `{}.merge(github_options)`). As a result, the OAuth2 defaults were being used. For example, the OAuth2 client options would have a key with `authorize_url` and `:authorize_url`, but the former was never used. As a result, the OAuth2 client would always use the wrong URL to talk to GitHub.

Note that this bug should also have affected GitLab, but not Bitbucket: The OAuth client is careful to convert all keys to symbols.

Closes #1268

See merge request !425
 2015-03-24 12:23:52 -07:00
Douwe MaanandMarin Jankovski 6b3cff19e9 Merge pull request #8995 from MichaelAlt/patch-1 
Faulty LDAP DN name escaping removed
 2015-03-24 12:19:33 -07:00
Dmitriy Zaporozhets 16d6f0e35b Version 7.9.0 v7.9.0 2015-03-20 17:11:11 -07:00
Marin JankovskiandDmitriy Zaporozhets 3b1842f67b Fix typo. 2015-03-20 16:28:11 -07:00
Marin JankovskiandDmitriy Zaporozhets d9415bf9c2 Change the name of the key used for bitbucket importer. 2015-03-20 16:28:11 -07:00
Dmitriy Zaporozhets 452ffd46f3 Fix votes inline rendering 2015-03-20 15:35:04 -07:00
Dmitriy Zaporozhets 7cd053b50a Improve issue sidebar position 2015-03-20 15:34:56 -07:00
Dmitriy Zaporozhets d9d1dc99bc Fix commits routing 2015-03-20 13:37:37 -07:00
Dmitriy Zaporozhets 6e4ee0df3c Make issue and merge request sidebar more compact 
* move votes block to participants
* make smaller font in sidebar
 2015-03-20 13:20:35 -07:00
Dmitriy Zaporozhets e494adc284 Remove upvotes js logic since it does not work as expected anyway 2015-03-20 13:20:19 -07:00
Dmitriy Zaporozhets 86fc054e14 Fix project name overflow on dashboard 2015-03-20 11:28:58 -07:00
Dmitriy Zaporozhets 5909e5f6b2 Revert "Increase timeout for Git-over-HTTP requests." 
This reverts commit 516bcabbf4.

Conflicts:
	Gemfile
 2015-03-19 22:47:46 -07:00
Marin JankovskiandDmitriy Zaporozhets ec746368f1 Remove mention of branch to commit to. 2015-03-19 22:46:07 -07:00
Marin Jankovski 68dcfabfe6 Version 7.9.0.rc3 v7.9.0.rc3 2015-03-19 12:38:24 -07:00
Marin Jankovski 9e0715c0a3 Merge branch '7-9-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-9-stable 2015-03-19 10:32:18 -07:00
Dmitriy ZaporozhetsandMarin Jankovski ab83fb992b Merge branch 'add_canceled_ci_status' into 'master' 
Add canceled CI status

Fixes https://github.com/gitlabhq/gitlab-ci/issues/564

https://dev.gitlab.org/gitlab/gitlab-ci/issues/169

![Screen_Shot_2015-03-19_at_17.10.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/87f47d9fd1b1a60e0c5402eedd1a1566/Screen_Shot_2015-03-19_at_17.10.08.png)

See merge request !1729
 2015-03-19 10:29:48 -07:00
Dmitriy Zaporozhets 91c65d03b5 Merge branch 'commits_in_push_data' into '7-9-stable' 
Commits in push data should always be an array.

See merge request !1726
 2015-03-19 17:22:46 +00:00
Dmitriy ZaporozhetsandMarin Jankovski 1ea6b05e87 Merge branch 'rake_backup' into 'master' 
Backup repo with tar instead of git bundle

Fixes gitlab/gitlab-ee#246

See merge request !1723
 2015-03-19 10:19:14 -07:00
Marin Jankovski d793de7ad7 Commits in push data should always be an array. 2015-03-18 23:32:57 -07:00
Dmitriy Zaporozhets 1667861ed2 Fix link to project from fork 2015-03-18 17:42:53 -07:00
Dmitriy Zaporozhets e716e4377f Version 7.9.0.rc2 v7.9.0.rc2 2015-03-18 14:23:06 -07:00
Douwe MaanandDmitriy Zaporozhets 8b17fcb897 Fix condensed range in MR push comment. 2015-03-18 14:08:22 -07:00
Marin JankovskiandDmitriy Zaporozhets 09657f1071 Move application setting to separate variable. 2015-03-18 14:04:29 -07:00
Vinnie OkadaandDmitriy Zaporozhets 33d5a60571 Handle nil restricted visibility settings 
Return `true` from `non_restricted_level?` when the
`restricted_visibility_levels` setting is nil.
 2015-03-18 14:04:17 -07:00
Dmitriy Zaporozhets c0524574c8 Bump gitlab_git to 7.1.2 2015-03-18 10:59:35 -07:00
Marin JankovskiandDmitriy Zaporozhets 245f03cd61 Fix the order of signin and signup on features page. 2015-03-18 09:25:13 -07:00
Dmitriy Zaporozhets 301f5bfc85 Merge branch '7-9-rc2' into '7-9-stable' 
Code for 7.9.0.rc2

cc @marin

See merge request !1719
 2015-03-18 15:27:17 +00:00
Dmitriy Zaporozhets d71e2318f9 Fix scroll for last push widget 2015-03-17 23:33:56 -07:00
Dmitriy Zaporozhets e34d778f01 Merge branch 'refactor-css' 2015-03-17 23:28:51 -07:00
Dmitriy Zaporozhets b6e7940c3d Fix email template css for project moved emails 2015-03-17 23:27:51 -07:00
Dmitriy ZaporozhetsandDmitriy Zaporozhets 368a391182 Merge branch 'css-vars' into 'master' 
More actively use css variabled to prevent colors duplication

See merge request !1715
 2015-03-17 23:27:17 -07:00
Dmitriy ZaporozhetsandDmitriy Zaporozhets 2e2f9d3eed Merge branch 'fix_subscription' into 'master' 
Fix public issue

See merge request !1717
 2015-03-17 23:25:38 -07:00
Marin Jankovski 2fd9f1cc2b Version 7.9.0.rc1 v7.9.0.rc1 2015-03-17 16:23:43 -07:00
Marin Jankovski c6f57d73e0 Merge branch 'update_install_documentation' into 'master' 
Update installation and upgrade documentation

See merge request !1714
 2015-03-17 21:53:25 +00:00
Marin Jankovski 9a0c99274e Update upgrade and installation docs for 7.9. 2015-03-17 14:07:05 -07:00
Douwe Maan 745aad4196 Merge branch 'fix_service_trigger_ui' into 'master' 
Fix service UI

There was a small bug in the service UI that caused an empty 'Trigger' label to be shown. After this change the 'Trigger' field is not shown when only one event type of supported.

Before:
![Screen Shot 2015-03-16 at 7.40.31 PM](https://gitlab.com/uploads/dblessing/gitlab-ce/0457a0b918/Screen_Shot_2015-03-16_at_7.40.31_PM.png)

I think in the future there are other things we can do to enforce at least one selected event type and also show the user what the singular event type is if only one is supported. That will take time to work out and this is definitely acceptable for the time.

See merge request !395
 2015-03-17 17:32:57 +00:00
Drew Blessing 6a269450e6 Fix UI bug regarding services 2015-03-17 12:09:26 -05:00
Dmitriy Zaporozhets 94238a9a7d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-17 09:49:55 -07:00
Dmitriy Zaporozhets bfc8ded120 Merge branch 'last-deploy-key' into 'master' 
Delete deploy key when last connection to a project is destroyed.

Addresses #1959.

See merge request !1710
 2015-03-17 16:49:38 +00:00
Dmitriy Zaporozhets 9162e34bb0 Merge branch 'issue_subscription' into 'master' 
Subscription to issue/mr

Fixes #1911 and #1909

![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png)

![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png)

See merge request !1702
 2015-03-17 16:45:04 +00:00