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
21,577 Commits 48 Branches 340 Tags
09637cc90879ee086f2a46f5eef7c261c548f49b
Commit Graph
21577 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 09637cc908 Merge branch 'invalidate_password' into 'master' 
Invalidate stored jira password if the endpoint URL is changed

https://gitlab.com/gitlab-org/gitlab-ce/issues/2997

See merge request !38
 2015-10-22 13:40:25 +00:00
Valery Sizov 7b2669971f Invalidate stored jira password if the endpoint URL is changed 2015-10-22 13:45:25 +02:00
Robert Speicher 5bd8b0160d Merge branch 'fix-jira-mention-spec' into 'master' 
Fix JIRA mention spec

Fixes spec that was skipped in 10de4261f0.

The expected behavior with commits mentioning issues, is that when the commit _closes_ the issue, the issue only gets the "closed by commit X" comment, and not also the "mentioned in commit X" comment.

With JIRA, it used to get both, and now does no longer.

The spec was updated to test the new ("correct") behavior.

See merge request !36
 2015-10-16 20:26:56 +00:00
Dmitriy Zaporozhets 01c027e590 Merge branch 'fix_rebase' into 'master' 
Fix "Rebase onto master"

https://gitlab.com/gitlab-org/gitlab-ee/issues/25

See merge request !37
 2015-10-16 14:57:32 +00:00
Valery Sizov 5f31626f5c Fix rebase onto master 2015-10-16 16:02:01 +03:00
Douwe Maan eb014dd5de Fix JIRA mention spec 2015-10-16 10:06:03 +02:00
Robert Speicher 2d7be2d499 Merge remote-tracking branch 'ce/master' 2015-10-16 00:12:30 -04:00
Robert Speicher 94ec666923 Merge branch 'when-syntax' into 'master' 
Implement when syntax in .gitlab-ci.yml

See merge request !1606
 2015-10-16 03:01:24 +00:00
Robert Speicher 64352d25b3 Correct spec description typo 
[ci skip]
 2015-10-15 21:30:47 -04:00
Robert Speicher e92010f0ac Merge branch 'ce_upstream_15_10' into 'master' 
CE upstream

See merge request !34
 2015-10-16 01:18:08 +00:00
Robert Speicher 10de4261f0 Skip a failing spec so we can get this show on the road 2015-10-15 20:14:34 -04:00
Robert Speicher 6fe2a679a7 Update CI YAML docs 2015-10-15 19:46:01 -04:00
Robert Speicher 62377d1754 Shut up, Rubocop 2015-10-15 19:44:15 -04:00
Robert Speicher c2c9f6d52d Remove 8.0-only steps from the 8.1 update guide 
Also adds a preamble note that a working 8.0 installation (i.e.,
gitlab-git-http-server, updated Nginx/Apache configs) is required before
proceeding.

[ci skip]
 2015-10-15 18:59:28 -04:00
Robert Speicher 6232bb1ef3 Remove notes about CI migration from 8.1 update guide 
[ci skip]
 2015-10-15 18:18:41 -04:00
Kamil Trzcinski 374ea21f32 Backticks around when types 2015-10-15 23:56:42 +02:00
Kamil Trzcinski 9419046196 Fix specs 2015-10-15 23:51:45 +02:00
Kamil Trzcinski 0aa6061d6a Implement when syntax in .gitlab-ci.yml 2015-10-15 23:49:39 +02:00
Robert Speicher 1b3f923908 Fix JIRA service feature 
The password is no longer presented on the form.
 2015-10-15 17:44:42 -04:00
Robert Speicher 5dd1dee488 Fix Mentionable spec 2015-10-15 16:47:32 -04:00
Robert Speicher 85a631203a Fix merge_request_helper_spec 2015-10-15 16:42:24 -04:00
Robert Speicher 687043d423 Ensure nil values are removed from ProjectTeam#max_member_access 2015-10-15 16:36:40 -04:00
Robert Speicher 4a189b14fb Merge branch 'rs-prepare-8-1-0' into 'master' 
Add 8.1 CE-to-EE update guide

[ci skip]

See merge request !35
 2015-10-15 20:30:27 +00:00
Robert Speicher 18d66570a8 Add 8.1 CE-to-EE update guide 
[ci skip]
 2015-10-15 16:27:35 -04:00
Robert Speicher 3d76390798 Merge branch 'sentences-end-in-periods' into 'master' 
Sentences end in periods.

[ci skip]

See merge request !1604
 2015-10-15 20:21:10 +00:00
Robert Speicher 9900a8531a Merge branch 'rs-prepare-8-1-0' into 'master' 
Prepare 8.1 documentation

[ci skip]

See merge request !1612
 2015-10-15 20:16:29 +00:00
Robert Speicher 8b54063453 Merge branch 'update-redcarpet' into 'master' 
Update redcarpet gem. Fixes gem memory leak

Fixes #2773 

See merge request !1607
 2015-10-15 20:14:42 +00:00
Robert Speicher facf8826da Add 8.0-to-8.1 update guide 2015-10-15 16:06:34 -04:00
Robert Speicher 6348f654cd Update Installation doc for 8-1-stable 2015-10-15 15:59:06 -04:00
Kamil Trzciński 6df06ded12 Merge branch 'build-view-ui-fixes' into 'master' 
Build View UI fixes



See merge request !1608
 2015-10-15 16:18:01 +00:00
Valery Sizov 6cd84aede7 satisfy rubocop 2015-10-15 19:15:58 +03:00
Kamil Trzcinski 567460d16d Added missing comma [ci skip] 2015-10-15 18:11:46 +02:00
Dmitriy Zaporozhets c82755f539 Update redcarpet gem. Fixes gem memory leak 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-15 18:01:24 +02:00
Kamil Trzcinski 71d0cfcff6 Make the builds view and warning notice nicer 2015-10-15 17:14:01 +02:00
Valery Sizov c0577a317c Merge branch 'master' into ce_upstream_15_10 2015-10-15 17:25:02 +03:00
Valery Sizov 1c542e281e Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2015-10-15 17:19:35 +03:00
Dmitriy Zaporozhets 19cfa86aa3 Merge branch 'rs-markdown-typography' into 'master' 
Markdown typography CSS fixes

The `!important` flags recently added to the `md-typography`
mixin's `pre` elements were overriding the background and
foreground colors for syntax highlighting.

| Before | After |
|:------:|:-----:|
| ![Screen_Shot_2015-09-25_at_3.32.32_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/802163bd9f46864ac89e7be165951f07/Screen_Shot_2015-09-25_at_3.32.32_PM.png) | ![Screen_Shot_2015-09-25_at_3.33.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6be72036653378405320085324dff5ad/Screen_Shot_2015-09-25_at_3.33.30_PM.png) |

See merge request !1442
 2015-10-15 14:11:13 +00:00
Dmitriy Zaporozhets 353ddbc795 Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications' 2015-10-15 15:56:43 +02:00
Kamil Trzcinski 0d09b5fefc Fix builds view count indicator 2015-10-15 15:50:40 +02:00
Valery Sizov 6b5fb14f10 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:49:01 +03:00
Valery Sizov 62bf2eb862 Merge branch 'fix/improve_reset_service_password_v2' into 'master' 
Improve invalidation of stored service password if the endpoint URL is changed (V2)

New version of !1583, using the same failproof logic but this time mirroring the name and behaviour of the change-tracking methods of ActiveModel::Dirty in order to make it clearer and more natural.

Added more tests to clarify the expected behaviour.

This is an alternative to !1594

/cc @vsizov @rspeicher

See merge request !1600
 2015-10-15 13:47:37 +00:00
Valery Sizov 8766c54bf2 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:46:48 +03:00
Yorick Peterse 5ce933599c Merge branch 'user-by-login-performance' into 'master' 
Improve User.by_login performance

This greatly speeds up the performance of `User.by_login`. I adopted some changes from @haynes in this patch, the credits go to him for coming up with those originally.

Fixes #2341

See merge request !1545
 2015-10-15 13:41:17 +00:00
Dmitriy Zaporozhets c0a6836be4 Merge branch 'view-issue-performance' 2015-10-15 14:37:04 +02:00
Douwe Maan d843cbe08d Sentences end in periods. 2015-10-15 13:44:32 +02:00
Douwe Maan 4b28f2d999 Merge branch 'git-archive-golang' into 'master' 
Let gitlab-git-http-server handle archive downloads

This change relies on changes in gitlab_git and gitlab-git-http-server.

fixes #2429

See merge request !1548
 2015-10-15 11:43:14 +00:00
Kamil Trzciński daccc54d25 Merge branch 'builds-view' into 'master' 
Added builds view

![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png)

/cc @dzaporozhets @vsizov 


See merge request !1593
 2015-10-15 11:35:57 +00:00
Dmitriy Zaporozhets 524b3db30c Merge branch 'fix-path-with-leading-dot-error' into 'master' 
Fix error preventing displaying of commit data for a directory with a leading dot

Directories with leading dots erroneously get rejected by the route controller if git
ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller.

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


See merge request !1574
 2015-10-15 10:36:24 +00:00
Dmitriy Zaporozhets 465a20888a Merge branch 'rs-remove-guard' into 'master' 
Remove guard-rspec and its supporting gems



See merge request !1551
 2015-10-15 10:34:28 +00:00
Yorick Peterse 97e02f4bc9 Added documentation on the various profiling tools 2015-10-15 12:15:18 +02:00