home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,651 Commits 48 Branches 340 Tags
2f1f6dfd668a16b4e9a2c85365b91a8eaf4ee62b
Commit Graph
18651 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Job van der Voort 2f1f6dfd66 Merge branch 'project-settings-icons' into 'master' 
Fixed the alignment of project settings icons

easy fix: changed %i to = icons

See merge request !432
 2015-06-30 09:14:51 +00:00
Darby 758ea7520e Fixed merge request rejection 2015-06-29 11:24:45 -07:00
Darby 083662f618 Fixed the icons 2015-06-29 09:52:19 -07:00
Darby bc47e86966 Fixed the alignment of project settings icons 2015-06-26 15:05:57 -07:00
Job van der Voort f93545b4f8 Merge branch 'k-gh-ee' into 'master' 
added info about GitHub EE

Added important info about importing from GitHub EE

https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1878#note_49973
https://dev.gitlab.org/gitlab/gitlabhq/issues/2410#note_49396

See merge request !431
 2015-06-26 09:09:35 +00:00
karen Carias 770ba45581 fixed word 2015-06-25 16:20:42 -07:00
karen Carias 6ae5b8d704 added info about GitHub EE 2015-06-25 11:29:11 -07:00
Dmitriy Zaporozhets 816605ed9b Merge branch 'info-groups-ee' into 'master' 
added important info to groups doc

I didn't notice it was not on EE, so I added the additional information.

https://dev.gitlab.org/gitlab/gitlab-ee/issues/310#note_49357

Thanks!

See merge request !430
 2015-06-23 08:47:04 +00:00
karen Carias 7c5e9e98b9 added info to groups doc 2015-06-22 10:02:59 -07:00
Dmitriy Zaporozhets b4523ebb8c Merge branch 'ce-to-ee' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/profiles/accounts/show.html.haml
 2015-06-19 11:26:03 +02:00
Dmitriy Zaporozhets a209e62e62 Fix jira integration for EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 10:37:51 +02:00
Marc Radulescu 00c3c4c56e fix typo 2015-06-18 16:00:27 +00:00
Dmitriy Zaporozhets ae713ae8fc Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md
 2015-06-17 11:25:59 +02:00
Job van der Voort 4f582a14b7 Merge branch 'from_own_instance' into 'master' 
added info about migrating to gitlab.com

Added useful information. Because of tweet https://twitter.com/A_Makedonsky/status/610860840036749314

See merge request !1870
 2015-06-17 08:44:28 +00:00
Dmitriy Zaporozhets a56516b614 Merge branch 'return-rebase-checkbox' into 'master' 
Return rebase checkbox

Should be backported to 7.12

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

See merge request !425
 2015-06-17 08:40:02 +00:00
Dmitriy Zaporozhets b0821a133f Merge branch 'rs-rails-update' into 'master' 
Bump rails to 4.1.11, jquery-rails to 3.1.3

rails 4.1.11 notes - http://weblog.rubyonrails.org/2015/6/16/Rails-3-2-22-4-1-11-and-4-2-2-have-been-released-and-more/

jquery-rails < 3.1.3 security advisory: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY

See merge request !830
 2015-06-17 07:18:47 +00:00
Karen Carias bdab1c6c46 added info about migrating to gitlab.com 2015-06-17 01:02:01 +00:00
Robert Speicher 68e77a3623 Bump jquery-rails gem version 2015-06-16 20:28:02 -04:00
Robert Speicher dce6441854 Bump rails to 4.1.11, and make the version requirement exact 2015-06-16 20:21:38 -04:00
Robert Speicher 89bcc1baf0 Merge branch 'rs-bootlint-fixes' into 'master' 
Random Bootlint fixes

See merge request !822
 2015-06-16 17:59:32 +00:00
Robert Speicher 0d7a0675ac Bootlint: Fix incorrectly nested form-group element 2015-06-16 13:33:48 -04:00
Robert Speicher 09b4e11d26 Bootlint: Add missing type attribute for buttons 2015-06-16 13:33:48 -04:00
Robert Speicher e3c1818a3e Bootlint: Modals no longer need a '.hide' class 2015-06-16 13:32:33 -04:00
Robert Speicher 7400cfc114 Bootlint: Use offset grid classes instead of empty divs 2015-06-16 13:32:32 -04:00
Dmitriy Zaporozhets 20fefc4f3f Bring valid .gitlab-ci.yml 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-16 16:58:47 +02:00
Dmitriy Zaporozhets 54d4e981af Add tests for rebase mr checkbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-16 16:57:11 +02:00
Douwe Maan adffe47d3c Merge branch 'support-comment-parallel-diff' into 'master' 
Support commenting on a diff in side-by-side view

### What does this MR do?

This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment.

There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later.

### Why was this MR needed?

Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9283

### Screenshot

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/3d0a3213fde38844a681a826da18139b/image.png)

See merge request !810
 2015-06-16 14:43:15 +00:00
Dmitriy Zaporozhets 19bd91b907 Return rebase-before-merge checkbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-16 16:40:10 +02:00
Stan Hu a7932fe2fd Support commenting on a diff in side-by-side view 
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
 2015-06-16 06:11:59 -07:00
Dmitriy Zaporozhets bd6239f8cf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-16 14:47:04 +02:00
Dmitriy Zaporozhets 3e585c01e1 Merge branch 'require_kerberos_when_enabled' into 'master' 
If kerberos is enabled require it

Since 'group: :kerberos' got [included in the Gemfile ](https://gitlab.com/gitlab-org/gitlab-ce/commit/2391a43a7073b4e723e9ca1f7ff19b30f8e51452) Kerberos no longer got [loaded when the app started](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/application.rb#L6)

This caused `Devise::OmniAuth::StrategyNotFound` error once Kerberos is enabled, failing to start GitLab .

With this we hopefully do not need to remove group from the Gemfile.

See merge request !819
 2015-06-16 12:46:48 +00:00
Dmitriy Zaporozhets fb5ffa89a6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-16 14:45:10 +02:00
Douwe Maan 9af2bc8907 Merge branch 'header_layout_issue' into 'master' 
Fix layout issue in header title truncation.

@douwe Thanks for reviewing this fix for the issue mentioned in https://dev.gitlab.org/gitlab/gitlabhq/issues/2314#note_48539.

**BEFORE**

![before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4ffb35f77155a92c64cfe36c66987eb0/before.gif)

**AFTER**

![after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2bb2d0c4a93164f6d47e24cdcb9a106b/after.gif)

See merge request !1867
 2015-06-16 12:34:21 +00:00
Douwe Maan 63969337a9 Merge branch 'applications_form' into 'master' 
Fix UI issues in Applications form

@douwe Thanks for reviewing this small fix.

---

Before:

![application_form_before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/11fbee17ad6a4c9456cd7d6cba5ae429/application_form_before.png)

---

After:

![application_form_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/0c64214ccda6c77095f468fcb8c748f3/application_form_after.png)

See merge request !1859
 2015-06-16 11:50:13 +00:00
Marin Jankovski c6c3577bc6 Use explicit if. 2015-06-16 13:44:52 +02:00
Douwe Maan 903132bc07 Merge branch 'fix-ext-issue-webbased-hooks' into 'master' 
Fix hooks for web based events with external issue references

The creation of cross references for external issues (which would fail)
is now prevented. This fixes a 500 error and the execution of hooks when
creating a merge request or commenting on one.

Fixes #1650, GH-9333.

This regression might have been introduced by
8f8a8ab32b. There is actually a TODO by
@rspeicher mentioning external issues which is lost (unhandled) in a
later commit.

This fix is related to !766 and !804 which fix a similar issue for hooks for
Git based events.

See merge request !794
 2015-06-16 11:36:31 +00:00
Job van der Voort b65f40b5c0 Merge branch 'update-release-doc' into 'master' 
Update release doc

See merge request !1865
 2015-06-16 09:56:30 +00:00
Dmitriy Zaporozhets e840ccaf15 Merge branch 'db-dump-instructions' into 'master' 
Improve DB dump instructions

See merge request !1868
 2015-06-16 09:33:45 +00:00
Jacob Vosmaer 6000c7199e Improve DB dump instructions 2015-06-16 10:00:02 +02:00
Valery Sizov 698f79e8b5 Merge branch 'new_syntax_yaml' into 'master' 
New syntax of .gitlab-ci.yml

See merge request !1862
 2015-06-16 07:52:03 +00:00
Nicolas d8209aebdc Fix layout issue in header title truncation. 2015-06-16 04:16:26 +02:00
Nicolas 4cf7d8d956 Fix consistency issues on New Application page. 2015-06-15 21:27:20 +02:00
Nicolas f18a24f0ac Fix layout issue when New Application validation fails. 2015-06-15 21:27:15 +02:00
Valery Sizov f715bc7b70 new syntax of .gitlab-ci.yml 2015-06-15 19:38:35 +03:00
Dmitriy Zaporozhets 5fa0248966 Merge branch 'fix-gitlab-ci-yml' into 'master' 
Look for .gitlab-ci.yml only if checkout_sha is present

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2396

cc @vsizov

See merge request !818
 2015-06-15 16:29:19 +00:00
Marin Jankovski 4c317531b4 If kerberos is enabled require it. 2015-06-15 18:04:30 +02:00
Dmitriy Zaporozhets 0674bf2339 Look for .gitlab-ci.yml only if checkout_sha is present 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-15 17:54:42 +02:00
Dmitriy Zaporozhets fe51fa26a7 Dont set checkout sha for removed branch/tag 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-15 17:54:22 +02:00
Jacob Vosmaer fc4160eb38 Add 'build RC1 packages' to monthly release steps 2015-06-15 16:53:01 +02:00
Jacob Vosmaer 83ce6cddc7 The changelogs are kept up to date continuously 2015-06-15 16:52:01 +02:00