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
21,782 Commits 48 Branches 340 Tags
e5eb700d5e8d561dc8a7ff3d35f5a8c867c4e19b
Commit Graph
21782 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery SizovandValery Sizov e5eb700d5e emoji picker: minor fixes 2015-12-22 23:12:23 +02:00
Valery SizovandValery Sizov dfd76c33d9 emoji css refactoring 2015-12-22 23:12:23 +02:00
Valery Sizov a48dd40a92 base implementation of emoji picker [ci skip] 2015-12-22 23:12:23 +02:00
Stan Hu 3b61dc47ec Merge branch 'fix_leave_project_display' into 'master' 
Fix and test leave project display

The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing. 

This fixes the display and also adds 2 different tests for it.

cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you!

See merge request !2166
 2015-12-22 19:30:32 +00:00
Dmitriy Zaporozhets 1cf45407d3 Merge branch 'new-group-page' into 'master' 
New group page

Implementing from https://gitlab.com/gitlab-org/gitlab-ce/issues/3480#note_2722988

cc @skyruler 

For https://gitlab.com/gitlab-org/gitlab-ce/issues/3480

See merge request !2174
 2015-12-22 16:25:25 +00:00
Douwe Maan 2309f339c6 Merge branch 'hotfix/sidekiq-cron-config' into 'master' 
Hotfix for sidekiq-cron being loaded from Settingslogic with defaults

This fixes a regression with "Stack level too deep" from master.

See merge request !2173
 2015-12-22 15:47:50 +00:00
Dmitriy Zaporozhets 8516b20571 New UI for group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-22 16:37:29 +01:00
Dmitriy Zaporozhets 34653e10aa Bump version 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-22 16:37:18 +01:00
Gabriel Mazetto a7a52f7567 Hotfix for sidekiq-cron being loaded from Settingslogic with defaults 2015-12-22 13:02:42 -02:00
Dmitriy Zaporozhets 347c1136c2 Merge branch 'new-colors' into 'master' 
New colour scheme

old
![Screenshot_2015-12-17_14.14.53](/uploads/5d6ac28b6d99186485d727a72cc8a662/Screenshot_2015-12-17_14.14.53.png)

new
![Screenshot_2015-12-17_14.15.07](/uploads/06e07fa3716aa8664b1507b390270285/Screenshot_2015-12-17_14.15.07.png)

* Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2577

See merge request !2151
 2015-12-22 10:43:56 +00:00
Dmitriy Zaporozhets 52bca6da22 New color for cover block background 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-22 11:22:14 +01:00
Dmitriy Zaporozhets e6e338f00e Merge branch 'feature/sidekiq-cron-config' into 'master' 
Sidekiq-cron configuration moved to gitlab.yml

When `sidekiq-cron` was introduced, jobs configuration where placed
in `schedule.yml` file.

As discussed in #3928, this is not desirable. 
We moved it to `gitlab.yml`, exposing only the "cron" part of the configuration.

See merge request !2087
 2015-12-22 09:49:47 +00:00
Robert Speicher 25bf3eb804 Merge branch 'fix-mr-500' into 'master' 
Fix MR 500 when viewing the MR page

Fixes #2712 

See merge request !2167
 2015-12-22 03:37:16 +00:00
Robert Speicher 36026fb97b Merge branch 'rs-bump-nokogiri' into 'master' 
Explicitly require Nokogiri 1.6.7.1 due to security issue

```
Name: nokogiri
Version: 1.6.7
Advisory: CVE-2015-5312
Criticality: High
URL: https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
Title: Nokogiri gem contains several vulnerabilities in libxml2
Solution: upgrade to >= 1.6.7.1
```

See merge request !2154
 2015-12-22 03:16:08 +00:00
Robert Speicher 09008026f6 Move ci_build_details_path helper spec to correct location 
Also, make it not fail.
 2015-12-21 21:57:51 -05:00
Kamil Trzcinski f8986e4bb6 Update CHANGELOG 2015-12-22 00:28:38 +01:00
Kamil Trzcinski a495b9bc18 Deprecate GitLabCiService making it to always be inactive 2015-12-22 00:28:38 +01:00
Kamil Trzcinski f898e52a00 ci_build_details_path should return nil if builds_page result is nil 
This is required since we parse URI later and remove the credentials
 2015-12-22 00:28:36 +01:00
Marvin FrickandKamil Trzcinski 0d05400bde removes api credentials from link to build_page 
Also adds a spec for MergeRequestHelper to avoid having a regression
later on.
 2015-12-22 00:28:19 +01:00
Drew Blessing 66a8281fdd Fix and test leave project display 2015-12-21 15:58:42 -06:00
Robert Speicher 4156a37aec Add 8.4.0 to CHANGELOG 
[ci skip]
 2015-12-21 15:34:39 -05:00
Robert Speicher d563722f7f Merge branch 'contributing-grabs-fix' into 'master' 
Fixed wrong URL to "up for grabs" issue filter

[ci skip]

See merge request !2162
 2015-12-21 20:28:14 +00:00
Robert Speicher f4c05ee45f Merge branch 'admin_add_identity' into 'master' 
Allow admin to create new user identities

Fixes #2442 

See merge request !2077
 2015-12-21 17:58:20 +00:00
Robert Speicher 12b6bf5c57 Merge branch 'fix-issue-related-mrs' into 'master' 
Fix issue related cross-project MRs

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

See merge request !2163
 2015-12-21 17:54:45 +00:00
Robert Speicher 9570495e75 Merge branch 'add_email_unlock' into 'master' 
Allow account unlock via email

We see a lot of users get confused about what it means when your account gets
locked. Many try to reset their password and are still faced with a lockout.
With this change, users receive an email that allows them to unlock their
account immediately. The previous behavior where the account is auto-unlocked
after a time also still works.

See merge request !2049
 2015-12-21 17:53:20 +00:00
Douwe Maan 17ed42e362 Merge branch 'issue_3452' 2015-12-21 17:43:58 +01:00
Douwe Maan c43fbaab93 Add changelog item 2015-12-21 17:43:43 +01:00
Douwe Maan 1be8a3e087 Move changelog item 2015-12-21 17:39:31 +01:00
Douwe Maan 9832e60ffb Merge branch 'tduehr/gitlab-ce-cas-support' 2015-12-21 17:38:37 +01:00
Douwe Maan 7fc2422c8d Add link to CAS doc 2015-12-21 17:37:55 +01:00
Douwe Maan e209ba7002 Merge branch 'git-version' into 'master' 
Show git version on admin page

Before
![git-version-beore](/uploads/57444ad42220c9dfe8f187b8e399227f/git-version-beore.png)

After
![git-version-after](/uploads/cc1b52ae1a251c2c46d9626c040726ab/git-version-after.png)

gitlab-org/gitlab-ce#4077




See merge request !2101
 2015-12-21 16:33:18 +00:00
Douwe Maan 058f27ad2a Merge branch 'coverage-regex' into 'master' 
Fix build coverage regex matching to allow captures.

Fixes #2644 

/cc @DouweM 

See merge request !2138
 2015-12-21 16:25:09 +00:00
Andriy Dyadyura 6dc487620b new colors 2015-12-21 16:10:03 +01:00
Dmitriy Zaporozhets 545a943468 Merge branch 'backport_jira' into 'master' 
Backport JIRA service

Fixes #3839 

Move EE JIRA functionality back to CE.

- [x] Make it function in manual testing
- [x] Migrate JIRA-specific tests
- [x] Tests pass
- [x] Migrate documentation
- [x] Rollback to previous CE JIRA integration locally, activate on a project then try to migrate db and see if integration still works.
- [x] Final EE search for JIRA references

See merge request !2146
 2015-12-21 14:47:27 +00:00
Douwe Maan 5ef2048f65 Fix issue related cross-project MRs 2015-12-21 15:36:08 +01:00
Laurens Stötzel e5715c1ee7 Fixed wrong URL to "up for grabs" issue filter 2015-12-21 15:20:35 +01:00
Jared Szechy 5a3237fd8d Fix build coverage regex. 
Added a spec for regex captures as well.

Fixes #2644
 2015-12-20 13:18:14 -05:00
Achilleas Pipinellis 4b4cbf0ce4 Merge branch 'removeNonDefinedVariableFromCIDoc' into 'master' 
Remove CI_BUILD_BEFORE_SHA from CI documentation

As pointed in #3210, the environment variable isn't usable any more.

See merge request !2118
 2015-12-19 08:46:38 +00:00
Achilleas Pipinellis 3ee33b54bf Merge branch 'update_artifact_runner_docs' into 'master' 
Clarify Windows shell executor artifact upload support

@ayufan noted that the runner does not support artifact upload for Windows shell executor. This adds a note so users aren't confused.

See merge request !2142
 2015-12-19 08:37:34 +00:00
Drew Blessing f177aaa5fa Backport JIRA service 2015-12-18 14:19:48 -06:00
Grzegorz Bizon 27859f7ed9 Merge branch 'ci-commit-status-skipped' into 'master' 
Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the builds are enabled

Fixes #3827 
Fixes #4157

/cc @grzesiek @dblessing 

See merge request !2139
 2015-12-18 18:48:06 +00:00
Robert Speicher 3ca78f015a Merge branch 'reference_clean_up' into 'master' 
Do not display project group/name when issue and MR are in same project

I noticed that things seem a bit cluttered for related merge requests
when displaying the group/project name for every item, even when it's
in the same project.

For merge requests that are in the same project as the issue we probably
don't need to display the 'in group / name' bit.

See merge request !2141
 2015-12-18 18:36:34 +00:00
Robert Speicher e5e4405747 Explicitly require Nokogiri 1.6.7.1 due to security issue 
Name: nokogiri
Version: 1.6.7
Advisory: CVE-2015-5312
Criticality: High
URL:
https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
Title: Nokogiri gem contains several vulnerabilities in libxml2
Solution: upgrade to >= 1.6.7.1
 2015-12-18 13:20:17 -05:00
Robert Speicher 22e65944ee Merge branch 'update-rack-attack-security' into 'master' 
Bump Rack Attack to v4.3.1 for security fix

https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1

See merge request !2153
 2015-12-18 18:13:42 +00:00
Stan Hu f33cb184f9 Bump Rack Attack to v4.3.1 for security fix 
https://github.com/kickstarter/rack-attack/releases/tag/v4.3.1
 2015-12-18 10:10:02 -08:00
Robert Speicher 3f26d24f52 Merge branch 'remove-extra-spaces' into 'master' 
Remove extra spaces after branchname

See merge request !2152
 2015-12-18 18:00:25 +00:00
Grzegorz Bizon a54bd0ff77 Merge branch 'fix/mr-reopen-button-title' into 'master' 
Fix merge-request-reopen button title

Closes #4069

See merge request !2147
 2015-12-18 16:03:39 +00:00
Andriy Dyadyura 2e7bee26f0 new-colors 2015-12-18 15:25:12 +01:00
Dmitriy Zaporozhets 08ddb8f768 Merge branch 'create_menu_additions' into 'master' 
Add new branch and tag action to tree dropdown

Right now, creating a branch or tag is only possible on the project page dropdown or on the commits page. This merge request both actions to the tree header dropdown. Now all repository web actions are available in this one location, plus the existing ones. It makes the operations a lot more intuitive.

## Existing Tree/Repository dropdown:

![Screen_Shot_2015-12-17_at_2.38.50_PM](/uploads/4d83a4b518093ea85f0859b385abcc7c/Screen_Shot_2015-12-17_at_2.38.50_PM.png)

## New Tree/Repository dropdown:

![Screen_Shot_2015-12-17_at_2.32.28_PM](/uploads/1fc18a511774630c5078a7d5c0fbb5b6/Screen_Shot_2015-12-17_at_2.32.28_PM.png)'

See merge request !2144
 2015-12-18 13:08:29 +00:00
Douwe Maan 9b9cf3bced Merge branch 'remove-duplicate-changelog-entry' into 'master' 
Remove duplicate entry in the changelog

/cc @DouweM 

See merge request !2149
 2015-12-18 10:20:00 +00:00