home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +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
Kamil Trzciński bdc62d704c Merge branch 'rs-reset-db' into 'master' 
Run db:reset before db:create on CI

Should prevent build failures caused by missing migrations, such as
https://gitlab.com/gitlab-org/gitlab-ce/builds/439927

See merge request !2045
 2015-12-10 09:50:21 +00:00
Robert Speicher ba79d1e5b8 Merge branch 'devise_paranoid_mode' into 'master' 
Enable Devise paranoid mode and ensure the returned message is the same
every time. This will prevent user enumeration (low impact). 

Prior to this change a user could type an email in the password reset
field and if the email didn't exist it returned an error. If the email
was valid it returned a message saying the forgot password link had been
emailed. After this change the user will receive a message that if the
email is in our database the reset link will be emailed. 

I also changed the throttle mechanism so it still works the same but
now returns the exact same message as above. Previously it would say
'You've already sent a request. Wait a few minutes'. This also allows
user enumeration, although it requires a double-check.

Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2624

See merge request !2044
 2015-12-10 01:58:11 +00:00
Dmitriy Zaporozhets 19837682e0 Merge branch 'ui-fix' into 'master' 
Fix list with controls display

Introduced in !2025

## Before

![before](/uploads/969f021f1f97062439cc4e836f29bdf6/before.png)

## After

![after](/uploads/defd46ddbd8392625848dfd3ac067869/after.png)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


See merge request !2048
 2015-12-10 01:17:34 +00:00
Drew Blessing f4ec906e90 Use devise paranoid mode and ensure the same message is returned every time 
Skipped CI because it has already passed. Had to rebase due to CHANGELOG.
 2015-12-09 18:40:37 -06:00
Dmitriy Zaporozhets 0549b5e8ee Merge pull request #9897 from atomaka/atomaka/bugfix/consistent-no-ssh-message 
Fix inconsistency with no ssh key message
 2015-12-10 01:28:53 +01:00
Dmitriy Zaporozhets ab8ab9b10c Fix list with controls display 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-10 01:24:10 +01:00
Robert Speicher 8dc689cf5a Merge remote-tracking branch 'dev/master' into 'master' 2015-12-09 18:43:00 -05:00
Robert Speicher e5f4f1d190 Merge branch 'yaml_safe_load' into 'master' 
Use YAML.safe_load

See merge request !1941
 2015-12-09 23:42:24 +00:00
Dmitriy Zaporozhets 57f7a4db63 Merge branch 'issue_3854' into 'master' 
Downcase commit author email for matching with users

Closes #3854 

See merge request !1992
 2015-12-09 21:27:47 +00:00
Dmitriy Zaporozhets d7044c5ccf Merge branch 'move-network' 2015-12-09 22:21:56 +01:00
Dmitriy Zaporozhets 8f6892500a Merge branch 'rs-delimit-build-counts' into 'master' 
Add number_with_delimiter to build counts



See merge request !2046
 2015-12-09 21:20:53 +00:00
Andrew Tomaka 48bf0a34e2 "No ssh" message should be same on project page 2015-12-09 16:11:21 -05:00
Kamil Trzciński b4b9df277b Allow [Symbol] when loading YAML 2015-12-09 20:58:53 +00:00
Dmitriy Zaporozhets 9b3277873c Merge branch 'fix-migrations' into 'master' 
Fix migrations for postgres on test environment

Make `be rake db:migrate:reset RAILS_ENV=test` work


Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !2002
 2015-12-09 20:09:03 +00:00
Dmitriy Zaporozhets 7a4d468576 Merge remote-tracking branch 'origin/mr-broken' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 21:06:04 +01:00
Robert Speicher cbac31d923 Add copy-to-clipboard button to Snippets#show 
Closes #3701
 2015-12-09 14:54:54 -05:00
Kamil Trzciński c5dacce4d7 Use YAML.safe_load 2015-12-09 19:50:00 +00:00
Robert Speicher 7b50965e99 Update CHANGELOG 
[ci skip]
 2015-12-09 14:21:08 -05:00
Robert Speicher 98958decce Add number_with_delimiter to build counts 2015-12-09 13:55:31 -05:00
Robert Speicher 4bcbb6178a Merge branch 'fix-typos' into 'master' 
Fix typos in integration docs

[ci skip]

See merge request !1999
 2015-12-09 18:37:45 +00:00
Robert Speicher 86aa535562 Run db:reset before db:create on CI 2015-12-09 13:35:20 -05:00
Douglas Barbosa Alexandre 4a29669dec Merge branch 'master' into fix-edit-notes-on-merge-request-diff 2015-12-09 16:31:15 -02:00
Robert Speicher cfe46f485d Merge branch 'master' into 'master' 
Update init script only once

The init script is already being updated in section 6.

See merge request !2038

[ci skip]
 2015-12-09 18:29:42 +00:00
Robert Speicher b255aad2d2 Merge branch 'rs-default-clone-fixes' into 'master' 
Simplify shared User SSH key steps

See merge request !2043
 2015-12-09 18:27:18 +00:00
Stan Hu 99fd78d6db Add spec for invalid options in project creation 2015-12-09 09:50:17 -08:00
Stan Hu 8d5527007a Provide better diagnostic message upon project creation errors 
Prevents an Error 500 when project fails to create due to invalid parameters.

See #3937
 2015-12-09 09:50:16 -08:00
Robert Speicher 7a2a860adc Simplify shared User SSH key steps 2015-12-09 12:09:00 -05:00
Dmitriy Zaporozhets 3cf4054854 Merge branch 'split-up-builds' into 'master' 
Split up 20min+ `spec:other` and `spinach:project` builds to increase parallelization



See merge request !2036
 2015-12-09 17:08:59 +00:00
Robert Speicher 3d4b4683eb Add CHANGELOG entry for !1998 
[ci skip]
 2015-12-09 12:08:44 -05:00
Dmitriy Zaporozhets d910424cf4 Merge branch 'remove-default-branch-option-from-doc' into 'master' 
Remove default_branch from project API creation documentation

The docs erroneously included `default_branch` as an option in project creation, but this field does not make sense because a new project has an empty repo with no branches. 

Closes #3937

See merge request !2034
 2015-12-09 17:08:02 +00:00
Dmitriy Zaporozhets 8440290f6a Merge branch 'rs-list-styling' into 'master' 
Improve styling for mixed list styles

Tasks in an ordered list will now also show their numbers.

Closes #2488

Related to #3921

See merge request !2026
 2015-12-09 17:06:30 +00:00
Dmitriy Zaporozhets 608a727516 Merge branch 'buttons-size' into 'master' 
Fix size of disabled 'New file' button

Before:

![Screen_Shot_2015-12-09_at_13.52.30](/uploads/d3d5dce9b5fcb5a4292177acba323d17/Screen_Shot_2015-12-09_at_13.52.30.png)

After:

![Screen_Shot_2015-12-09_at_13.52.20](/uploads/a813fb817cfd4bff6b17fad34e79f3b1/Screen_Shot_2015-12-09_at_13.52.20.png)


See merge request !2040
 2015-12-09 17:00:48 +00:00
Dmitriy Zaporozhets e426c027b0 Merge branch 'remove-redcloth' into 'master' 
Remove RedCloth and no longer allow bundle-audit to fail

As far as I can see, RedCloth wasn't used at all.

See merge request !2037
 2015-12-09 16:59:30 +00:00
Douglas Barbosa Alexandre 364041e7dd Update CHANGELOG 2015-12-09 14:53:21 -02:00
Robert Speicher c3676aa156 Merge branch 'default_clone_protocol_based_on_user_keys' into 'master' 
When rendering the clone page, check user profile to decide default
clone protocol

If the user has uploaded SSH-keys, use SSH; otherwise, use http(s).

Closes #3504.

See merge request !1998
 2015-12-09 16:52:43 +00:00
Dmitriy Zaporozhets 2c61e3c057 Fix test for network shortcut 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 17:47:45 +01:00
Dmitriy Zaporozhets 2cb542b9d3 remove unnecessary code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-09 17:39:13 +01:00
Dmitriy Zaporozhets 1954bd6ee0 Merge branch 'fix-admin-should-be-able-to-add-himself-to-group' into 'master' 
Signed in Admin can add/remove himself to a group/project

Fixes #3640 

/cc @JobV Could you have a look as well?

See merge request !1942
 2015-12-09 16:37:28 +00:00
Rubén Dávila 7e8fc48227 Normalize email when looking for GitLab users from commit info. #3854 2015-12-09 11:10:08 -05:00
Douwe Maan 37199719c7 Make sure everyone has shared/lfs-objects 2015-12-09 16:19:59 +01:00
Douglas Barbosa Alexandre 429932a8b4 Ensure new notes are highlighted properly on a merge request diff 2015-12-09 12:17:00 -02:00
Douglas Barbosa Alexandre 05f06955ba Ensure existing notes are highlighted properly on a merge request diff 2015-12-09 12:16:54 -02:00
Eirik Lygre bb79573c01 Merge branch 'master' into default_clone_protocol_based_on_user_keys 2015-12-09 15:07:10 +01:00
Douglas Barbosa Alexandre 9e5ac7285c Ensure notes are replaced on a merge request diff when they're updated 2015-12-09 11:30:21 -02:00
Douwe Maan 73c59de062 Merge branch 'master' into split-up-builds 2015-12-09 13:56:26 +01:00
Douwe Maan f7ff146aaa Fix size of disabled 'New file' button 2015-12-09 13:52:13 +01:00
Felix Eckhofer 64eaccf10a Update init script only once 
The init script is already being updated in section 6.
 2015-12-09 12:26:18 +01:00
Jacob Vosmaer 9bfd6c44e2 Merge branch 'fix-workhorse-upgrade-info' into 'master' 
Remove the prepended v on GitLab Workhorse upgrade doc

Fix for https://gitlab.com/gitlab-org/gitlab-workhorse/issues/4



See merge request !2020
 2015-12-09 11:19:29 +00:00
Douwe Maan 3fd1a36d74 Fix spec 2015-12-09 12:00:26 +01:00
Douwe Maan 6c6fb1d8bb Split up spec:other even more 2015-12-09 11:56:23 +01:00