home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +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
Robert Speicher 2efb0b6e93 Remove duplicate timeago call 2015-06-17 16:37:10 -04:00
Robert Speicher 8c8cd8be43 Update time_ago_with_tooltip helper 
Minor refactoring, add specs, changes arguments to use keywords.
 2015-06-17 16:37:10 -04:00
karen Carias d5e3dae303 fixed file name 2015-06-17 09:44:48 -07:00
Alex Lossent d96d9aae42 Fix behavior of ldap_person method in Gitlab::OAuth::User 
Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.
 2015-06-17 18:06:27 +02:00
Sytse Sijbrandij e12b643192 Merge branch 'link-to-rc-packages-in-tweet' into 'master' 
Add 'proposed tweet' for RC1

See merge request !835
 2015-06-17 14:47:53 +00:00
Jacob Vosmaer 70a4fb76c9 Add 'proposed tweet' for RC1 2015-06-17 13:29:04 +02:00
Marin Jankovski b6688f830b Add a build preparation script, modify gitlab.ci.yml to use the script. 2015-06-17 12:23:43 +02:00
Dmitriy Zaporozhets 79e24886ec Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-17 11:56:43 +02:00
Dmitriy Zaporozhets be2a7506eb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-06-17 11:56:37 +02:00
Dmitriy Zaporozhets 1eb51e1706 Merge branch 'placeholder_text' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
 2015-06-17 11:43:08 +02:00
Dmitriy Zaporozhets 73918efb27 Merge branch 'swellard-issue-6123' into 'master' 
Fix duplicate 'Email has already been taken' message when creating a user

devise :validatable and validates uniqueness set on the user email field cause 2 validations to fire when creating a new user with an email address already in use, Issue 6123

@stanhu Thanks for your input on merge request 807, I'll close that one in favour of this as I have added tests

See merge request !817
 2015-06-17 09:01:41 +00:00
Dmitriy Zaporozhets de5c9b795d Merge branch 'rs-dev-issue-2373' into 'master' 
Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')

https://dev.gitlab.org/gitlab/gitlabhq/issues/2373

See merge request !821
 2015-06-17 09:00:57 +00: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 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
karen Carias 2634d3ad7a added images and fixed starting a shell doc 2015-06-16 17:44:21 -07: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
karen Carias 60bee28430 added starting a shell doc and index 2015-06-16 16:05:56 -07:00
Darby c39c823421 Changed the placeholder text and modified the css class to make it visible 2015-06-16 14:44:13 -07: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
Robert Speicher ad049a8e52 Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org') 2015-06-16 13:08:29 -04: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
swellard 19e5b043fe Fix duplicate 'Email has already been taken' message when creating a user, updated comments 2015-06-16 14:24:05 +01:00
swellard 98615ef536 Fix duplicate 'Email has already been taken' message when creating a user 2015-06-16 14:24:05 +01: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