home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 04:56:16 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,776 Commits 48 Branches 340 Tags
ea7467d2be0e367ed1ec6df656cab059a9db6da0
Commit Graph
20776 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets ea7467d2be Refactor group members tests a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00
Dmitriy Zaporozhets 34cc8f4a60 Improve project members page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00
Dmitriy Zaporozhets d9749c8d36 Improve UI for group members page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-25 10:24:29 +01:00
Robert Schilling 4cfc3df534 Merge branch 'lfs-doc' into 'master' 
Add reference to Microsoft's Git Credential Manager for Windows.

Minor update to the LFS-documentation, referencing Microsoft's Git Credential Manager for Windows.

See merge request !1892
 2015-11-25 09:05:31 +00:00
Dmitriy Zaporozhets 3fd885fd91 Merge branch 'rs-update-colorize' into 'master' 
Bump colorize to ~> 0.7.0

Also removes `colored` which came in during the CI merge and is
redundant.

Closes #2822

See merge request !1895
 2015-11-25 09:02:06 +00:00
Dmitriy Zaporozhets 85d537ac73 Merge branch 'rs-update-rack-oauth2' into 'master' 
Bump rack-oauth2 to ~> 1.2.1

Closes #2748

See merge request !1891
 2015-11-25 09:01:12 +00:00
Dmitriy Zaporozhets cbdccf66bf Merge branch 'rs-update-creole' into 'master' 
Bump creole to ~> 0.5.0

Closes #2815

See merge request !1890
 2015-11-25 09:00:38 +00:00
Dmitriy Zaporozhets 1c8fa3b255 Merge branch 'rs-update-gon' into 'master' 
Bump gon to ~> 6.0.1

Closes #2856

See merge request !1889
 2015-11-25 09:00:10 +00:00
Robert Speicher 5288fbe4eb Merge branch 'session_expire_delay_cannot_be_nil' into 'master' 
Maybe rescue session_expire_delay by setting a default value.

Related to gitlab-org/omnibus-gitlab#956

See merge request !1880
 2015-11-25 02:27:27 +00:00
Robert Speicher 9a4ae85948 Merge branch 'rs-rescue-standarderror' into 'master' 
Rescue StandardError, not Exception

See merge request !1893
 2015-11-25 01:52:22 +00:00
Robert Speicher ec002e8026 Remove usage of Colored 2015-11-24 19:20:23 -05:00
Robert Speicher 28de6770fa Bump colorize to ~> 0.7.0 
Also removes `colored` which came in during the CI merge and is
redundant.

Closes #2822
 2015-11-24 16:29:21 -05:00
Robert Speicher a2915aeb66 Rescue StandardError, not Exception 2015-11-24 16:12:25 -05:00
Eirik Lygre b982827812 Add reference to Microsoft's Git Credential Manager for Windows. 2015-11-24 20:55:18 +00:00
Robert Speicher 446a95d307 Bump rack-oauth2 to ~> 1.2.1 2015-11-24 15:48:49 -05:00
Robert Speicher 26f9dbf8a9 Bump creole to ~> 0.5.0 
Closes #2815
 2015-11-24 15:42:42 -05:00
Robert Speicher 776027e4c7 Bump gon to ~> 6.0.1 
Closes #2856
 2015-11-24 15:36:36 -05:00
Dmitriy Zaporozhets 0fb5ffd8b0 Merge branch 'fix-group-member' into 'master' 
Fix 500 error when update group member permission

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

Fixes #3578 

See merge request !1884
 2015-11-24 20:19:07 +00:00
Dmitriy Zaporozhets 6d5d45ada1 Merge branch 'issue_guidelines_with_omnibus_commands' into 'master' 
Spell out commands for omnibus-gitlab packages.

User got confused in gitlab-org/gitlab-ce#3614

See merge request !1881
 2015-11-24 18:10:06 +00:00
Dmitriy Zaporozhets cbaa33db8a Small code improvement 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-24 17:40:41 +01:00
Dmitriy Zaporozhets cb9f573818 Fix rubocop complain 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-24 16:17:11 +01:00
Dmitriy Zaporozhets 4caef63d82 Fix 500 error when update group member permission 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-24 16:13:21 +01:00
Marin Jankovski 0985032132 Also fallback to a default value if none is set. 2015-11-24 15:57:28 +01:00
Dmitriy Zaporozhets 9ab2e5f516 Merge branch 'fix-small-text' into 'master' 
Fix ultra-light color for small text

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

See merge request !1879
 2015-11-24 13:23:33 +00:00
Marin Jankovski 01bd7baf4f Spell out commands for omnibus-gitlab packages. 2015-11-24 12:21:11 +01:00
Marin Jankovski 9595ec036a Maybe rescue session_expire_delay by setting a default value. 2015-11-24 12:11:31 +01:00
Dmitriy Zaporozhets d1a7356398 Fix ultra-light color for small text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-24 11:36:53 +01:00
Dmitriy Zaporozhets 8c0f2acad9 Merge branch 'service-tests' into 'master' 
Add tests for (Create|Update)ReleaseService

As promised 

See merge request !1875
 2015-11-24 10:04:39 +00:00
Robert Speicher 31a34b5917 Merge branch 'ci-artifacts-path' into 'master' 
Expose artifacts path

This fixes broken artifacts storage path.

Fixes #3607 
Fixes #3608

Related: gitlab-org/omnibus-gitlab!544

See merge request !1869
 2015-11-23 22:19:13 +00:00
Robert Speicher 2d77a21d59 Merge branch 'ci-fix-500' into 'master' 
Fix 500 when using CI

- Fix for Ci::Build state machine, allowing to process builds without the project
- Forcefully update builds that didn't want to update with state machine
- Fix saving GitLabCiService as Admin Template

Fixes #3556 

See merge request !1873
 2015-11-23 21:51:51 +00:00
Robert Speicher 62303bfad1 Update CHANGELOG 
[ci skip]
 2015-11-23 16:51:16 -05:00
Robert Speicher 148eb04a9a Merge branch 'fix-clipboard-styling-in-create-mr' into 'master' 
Fix CSS styling for clipboard icon in new MR page

Closes #3602 

See merge request !1870
 2015-11-23 21:18:09 +00:00
Robert Schilling e4f3d05c74 Add tests for (Create|Update)ReleaseService 2015-11-23 18:35:16 +01:00
Dmitriy Zaporozhets 36f7b624be Merge branch 'bundler-audit' into 'master' 
Add bundler-audit to CI

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

cc @DouweM @rspeicher @vsizov 

See merge request !1874
 2015-11-23 15:51:39 +00:00
Dmitriy Zaporozhets f84fb81970 Merge branch 'required_version_and_docs_update' into 'master' 
Update required version of lfs client and separate the docs for users and admins.



See merge request !1855
 2015-11-23 14:47:35 +00:00
Dmitriy Zaporozhets b6ed935dcd Allow bundler:audit to fail 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-23 15:45:16 +01:00
Dmitriy Zaporozhets 200c82adad Fix gitlab-ci.yml syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-23 15:27:34 +01:00
Dmitriy Zaporozhets 7ac112d8e8 Add few fixes to documentation based on comments from review 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-23 15:18:59 +01:00
Dmitriy Zaporozhets 091b879ce0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-23 15:04:47 +01:00
Dmitriy Zaporozhets 93f32b25d2 Add bundler-audit to CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-23 14:57:41 +01:00
Dmitriy Zaporozhets c35d3c43d8 Merge pull request #9843 from ferdinandrosario/upgrade 
Updated rails patch
 2015-11-23 14:46:49 +01:00
Douwe Maan 761bf63810 Merge branch 'issue_2296' into 'master' 
Generate system note after Task item has been updated on Issue or Merge Request.

Reference: #2296 

Everytime the User check or uncheck a Task Item from the Issue or
Merge Request description, a new update is going to be
added to the activity logs of the Issue or Merge Request.

Note that when using the edit form, you can only update the Task item
status or add/delete/modify existing ones. Doing both actions is not
fully supported.

See merge request !1848
 2015-11-23 13:09:34 +00:00
Kamil Trzcinski 57e974c03b Fix 500 when using CI 
- Fix for Ci::Build state machine, allowing to process builds without the project
- Forcefully update builds that didn't want to update with state machine
- Fix saving GitLabCiService as Admin Template
 2015-11-23 13:51:41 +01:00
Kamil Trzcinski 11728b50f9 Expose artifacts path 2015-11-23 13:05:22 +01:00
Dmitriy Zaporozhets 1324cc2f6e Merge branch 'issue_2993' into 'master' 
Update copy used in alert message when deleting branches or tags.

Reference: #2993 

Before:

![Screen_Shot_2015-11-19_at_4.10.34_PM](/uploads/5cdf7e8c5d4c6bd9e18584b118420c8c/Screen_Shot_2015-11-19_at_4.10.34_PM.png)

![Screen_Shot_2015-11-19_at_4.14.19_PM](/uploads/80513b96492122860733462efa8c8015/Screen_Shot_2015-11-19_at_4.14.19_PM.png)

After:

![Screen_Shot_2015-11-19_at_4.59.56_PM](/uploads/80367f2acea0d22d36a5297bdc29163e/Screen_Shot_2015-11-19_at_4.59.56_PM.png)

![Screen_Shot_2015-11-19_at_4.59.30_PM](/uploads/134cf02d1fb3feff2159b5659d149d54/Screen_Shot_2015-11-19_at_4.59.30_PM.png)

See merge request !1846
 2015-11-23 10:56:02 +00:00
Douwe Maan 9a273dbe34 Merge branch 'issue-2831' into 'master' 
Fix Assignee selector when 'Unassigned' #2831

Fixes #2831 

![Screen_Shot_2015-11-21_at_12.04.42_AM](/uploads/e3cb98ff805366805f4a989d927e3f10/Screen_Shot_2015-11-21_at_12.04.42_AM.png)


See merge request !1860
 2015-11-23 10:51:06 +00:00
Robert Speicher 732c2d15d2 Update doc/release/patch.md with more current patch procedures 
[ci skip]
 2015-11-22 18:24:53 -05:00
Stan Hu ab238a7677 Fix CSS styling for clipboard icon in new MR page 
Closes #3602
 2015-11-22 07:23:56 -08:00
Robert Speicher 7b70a03e44 Merge branch 'award_fix' into 'master' 
Emoji bug: Invalid url to image

Closes #3591

See merge request !1868
 2015-11-22 04:10:25 +00:00
Robert Speicher b166ee6b1d Merge branch 'fix-award-emoji-api' into 'master' 
Add upvote/downvote fields to merge request and note API to preserve compatibility

As discussed in !1825 we should not break the API compatibility.

* This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
* Add the fields `upvote`/`downvote` to the notes API, which always return `false`

This behavior is documented in the API docs.

See merge request !1867
 2015-11-22 03:45:15 +00:00