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
19,826 Commits 48 Branches 340 Tags
46d748dc2e7329fede6fd2c20038e98100b90fec
Commit Graph
19826 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 46d748dc2e Highlight comment based on anchor in URL 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 16:06:11 +02:00
Dmitriy Zaporozhets e10f5f4f56 Merge branch 'last-commit-project-page' into 'master' 
Show last commit from default branch on project home page

Implements #2705 

Screenshot: 

![Screenshot_2015-10-15_19.03.29](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef1cfa6764ab0ec5e7584ae61980a47d/Screenshot_2015-10-15_19.03.29.png)


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

cc @skyruler 

See merge request !1610
 2015-10-16 13:21:37 +00:00
Dmitriy Zaporozhets 47e17103f5 Change order of sha and commit message on project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 13:36:48 +02:00
Dmitriy Zaporozhets 66584f72fd Add changelog item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 11:15:12 +02:00
Douwe Maan 0c2df939df Merge branch 'notify-mr-upon-branch-presence-change' into 'master' 
Add a system note and update relevant merge requests when a branch is deleted or re-added

If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

The new messages look like:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6581eea069cd8e485b7fa4187ed4c043/image.png)

Closes #2926 

See merge request !1601
 2015-10-16 09:03:24 +00:00
Dmitriy Zaporozhets d1450af81f Add tests for last commit info on project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 10:10:33 +02:00
Stan Hu f726df26c2 Reorder system note verb to say "Restored source branch X" instead of "Source branch X restored" 2015-10-16 00:51:25 -07:00
Stan Hu 888c1a3fc5 Add spec for refresh service adding notes to restored branches 2015-10-16 00:33:58 -07:00
Stan Hu bf290a52b7 Rubocop fix 2015-10-15 23:54:13 -07:00
Stan Hu 577565d939 Add system notes for restored branches 2015-10-15 23:54:13 -07:00
Stan Hu 9c67f4fb51 Memoize merge request source branches 2015-10-15 23:54:13 -07:00
Stan Hu effa94bb87 Improve SystemNote interface for branch add/restore case 2015-10-15 23:54:13 -07:00
Stan Hu 22775c596f Preserve target branch 2015-10-15 23:54:13 -07:00
Stan Hu 2611d9f63c Add a system note and update relevant merge requests when a branch is deleted or re-added 
If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

Closes #2926
 2015-10-15 23:54:13 -07:00
Stan Hu bd3689e9e0 Merge pull request #9740 from ashleyhindle/patch-1 
Changed loose to lose
 2015-10-15 23:38:15 -07:00
Ashley Hindle a317c5296e Changed loose to lose 2015-10-16 07:36:20 +01: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 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 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
Dmitriy Zaporozhets 9fd4822986 Show last commit from default branch on project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-15 19:02:29 +02: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
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
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 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
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
Alex Lossent 98e666ab6a Improve invalidation of stored service password if the endpoint URL is changed 
Password can now be specified at the same time as the new URL, and the service
template admin pages now work.
 2015-10-15 12:07:59 +02:00
Yorick Peterse bed29940ef Fixed Rubocop styling issues 2015-10-15 12:05:01 +02:00
Yorick Peterse e5925d073e Renamed Note.inc_associations to with_associations 2015-10-15 12:05:01 +02:00