home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,815 Commits 48 Branches 340 Tags
e45bc034fa4a003b0bc45233e32aedcca4eecea1
Commit Graph
23815 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis e45bc034fa Merge branch 'typo_api_builds_doc' into 'master' 
Fix typo in doc/api/builds.md



See merge request !2795
 2016-02-12 09:27:16 +00:00
Achilleas Pipinellis 324e6743cf Fix typo in doc/api/builds.md 
[ci skip]
 2016-02-12 11:25:20 +02:00
Douwe Maan 2afd95a025 Merge branch 'streamline-email-validation' into 'master' 
Validate email addresses using Devise.email_regexp

Also:
- Get rid of legacy `:strict_mode`
- Get rid of custom `:email` validator
- Add some shared examples to spec emails validation

This supersedes !2754 and fixes #3851.

See merge request !2771
 2016-02-12 09:09:23 +00:00
Douwe Maan 0807bd5130 Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'master' 
API: Allow to set or update a merge-request's milestone

_Originally opened at !2107 by @ skakirill._

- - -


See merge request !2755
 2016-02-12 08:39:18 +00:00
Robert Speicher dd4171eb63 Merge branch 'issue_13369' into 'master' 
Don't show fork button if user can't fork the project.

Fixes #13369 

See merge request !2793
 2016-02-12 03:58:16 +00:00
Robert Speicher 67fefe0ed9 Merge branch 'issue_13365' into 'master' 
Load all blob data when highlighting content for git-blame.

Fixes #13365

See merge request !2792
 2016-02-12 00:36:38 +00:00
Rubén Dávila 4d1e82e0bb Don't show fork button if user can't fork the project. 2016-02-11 19:02:52 -05:00
Rubén Dávila 5a5ee6188b Load all blob data when highlighting content for git-blame. 2016-02-11 18:30:05 -05:00
Achilleas Pipinellis 07faf8144a Merge branch 'fix_markdown_image_link' into 'master' 
Add a new image in the markdown help page

Previously we were linking directly from the public/
directory. While this worked for the GitLab help page,
it was not working for doc.gitlab.com. Adding an image
in a relative directory and linking from there serves
both ends.

Fixes #13233

See merge request !2790
 2016-02-11 18:50:22 +00:00
Achilleas Pipinellis db868e4bfe Add a new image in the markdown help page 
Previously we were linking directly from the public/
directory. While this worked for the GitLab help page,
it was not working for doc.gitlab.com. Adding an image
in a relative directory and linking from there serves
both ends.

[ci skip]
 2016-02-11 20:37:20 +02:00
Jeroen van Baarsen 95d16e75a3 Merge branch 'remove_sqlite_check' into 'master' 
Remove sqlite check in raketask

This is a relic from 4 major releases ago. Time to remove it.

See merge request !2777
 2016-02-11 18:22:14 +00:00
Achilleas Pipinellis c9919f3b14 Merge branch 'patch-1' into 'master' 
Fixed "Docker Fundamentals" link in GitLab Documentation.

I noticed that the *Docker Fundamentals* link in the *Using Docker Images* part of the GitLab Documentation is broken.

Screenshot:
![broken-link](/uploads/8d2fc782b2f5d4f3316a631f801cd3c7/broken-link.png)

Changing it to "https://docs.docker.com/" should fix the problem.

See merge request !2786
 2016-02-11 17:58:26 +00:00
Rémy Coutable 973a7d040e Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' into 'master' 
Add merge_requests/:merge_request_id/closes_issues

_Originally opened at !2660 by @Schniz._

- - -

Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully

See merge request !2779
 2016-02-11 17:13:36 +00:00
Denis Meiswinkel 7e904ab37b Updated Docker Fundamentals link as suggested by @axil 2016-02-11 16:03:31 +00:00
Denis Meiswinkel 0008dc2f2b Fixed "Docker Fundamentals" link. 2016-02-11 15:10:35 +00:00
Kamil Trzciński 9b1dfd3e81 Merge branch 'use-caching' into 'master' 
Use caching

This enables to use built-in caching feature instead of using the `/cache` folder.

See merge request !2747
 2016-02-11 12:05:24 +00:00
Kamil Trzciński 4eaa6a4c4d Merge branch 'fix/ci-build-status-badge' into 'master' 
Fix CI build status badge

Closes #5570, #4935, #4163

See merge request !2704
 2016-02-11 12:04:57 +00:00
Grzegorz Bizon 9e6190485b Parse XML instead of HTML in tests for a SVG build badge 2016-02-11 10:29:15 +01:00
Grzegorz Bizon debaa81329 Move build badge specs to badges directory 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 28b11963b1 Move builds badge implementation to new badges controller 2016-02-11 10:29:15 +01:00
Grzegorz Bizon ee1bee5834 Add Changelog entry for changes in builds badge 2016-02-11 10:29:15 +01:00
Grzegorz Bizon d51e8e1b77 Inherit build badge access permissions from project 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 7e1453f2f0 Fix rubocop offence in routes for build badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 418e761ad1 Add short builds badge documentation 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 29f2600ab6 Improve build badge tests, add another test case 2016-02-11 10:29:14 +01:00
Grzegorz Bizon cf0eab5047 Add feature tests for builds status badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon eb7721e183 Add second build for each commit in build seeds 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 479d412e09 Respond to proper format for build badge request 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 52352dccc3 Move badge implementation to builds controller 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 442a49db2b Skip authentication when requesting commit status badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 28c4c949a5 Improve CI status badge implementation 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 14f928b730 Add CI status badge implementation to commit controller 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 01a406f5b0 Render 404 if there is no project for old CI status badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon a2f61368f9 Add deprecation warning for old CI status badge action 
We keep this only for backwards compatibility with projects that have
been migrated from GitLab CI. New project badge will go elsewhere.
 2016-02-11 10:29:14 +01:00
Rémy Coutable b91d1890a8 Pass current_user to merge_request.closes_issues in API ans streamline MR API specs 2016-02-11 09:34:07 +01:00
Gal SchlezingerandRémy Coutable 78e36780be Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' route in the API 
Added some documentation for it

Added to changelog

Added curl example and an attribute table

Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb"

Fixed the attributes and changed the documentation to be at "merge_requests.md" too

Changed generic titles to more specific titles

added an underscore

added tests. it depends on a newer version of gitlab-test project
I'm doing a  since I need to add a branch to the `gitlab-test` repo

removed the before

using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass

Removed the 'closes-issues' key from test_env. so it should pass the tests

Moved the two initializations to the describe block

Changed the changelog
 2016-02-11 09:34:07 +01:00
Douglas Barbosa Alexandre 9bcc9ec14c Merge branch 'display-mr-link-if-thre-is-one' into 'master' 
Replaces "Create merge request" link with one to the MR when one exists

Fixes #3716

* Without MR:

![before-1](/uploads/abcb2eb5bb5927a83c2f1700528f852c/before-1.png)

* With MR:

![after-1](/uploads/9020b871e1aa08d3e5a45359336ef0f2/after-1.png)

* Without MR:

![before-2](/uploads/bb3bd1a74efc193ad31af68f1e04ef5f/before-2.png)

* With MR:

![after-2](/uploads/789d32aef12f39c605e665d0c4bc9fbe/after-2.png)

* Without MR:

![before-3](/uploads/a9aff7a11eb1069be24c37a5455be809/before-3.png)

* With MR:

![after-3](/uploads/48fe81ea50657fe5b2de0d25260d8e4b/after-3.png)

See merge request !2670
 2016-02-10 21:53:41 +00:00
Douglas Barbosa Alexandre c1541fdf1e [ci skip] Update CHANGELOG 2016-02-10 19:52:34 -02:00
Robert Speicher 42607a7f17 Merge branch 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into 'master' 
Add assignee data to Issuables' hook_data

Originally opened at !1633 by @brammeleman.

Fixes #3047. Fixes #2475.

See merge request !2724
 2016-02-10 21:26:01 +00:00
Robert Speicher 51998fddca Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master' 
Actually use the `skip_merges` option in Repository#commits

Originally opened at !2067 by @cwq1913.

See merge request !2750
 2016-02-10 19:01:44 +00:00
Sytse Sijbrandij 5f07e13b7d Add notice about MR target for stable fixes 2016-02-10 17:36:23 +00:00
Kamil Trzcinski c9371eab13 Use caching, instead of haxxy /cache 2016-02-10 16:53:55 +01:00
Achilleas Pipinellis f8036ec910 Remove sqlite check in raketask 2016-02-10 16:54:15 +02:00
Achilleas Pipinellis fd1a68d4da Merge branch 'fix/ci-api-builds-docs' into 'master' 
Fix builds API formatting

This MR is fixing formatting for builds API documentation.

See merge request !2775
 2016-02-10 14:14:10 +00:00
Tomasz Maczukin ba1f6de8a5 Add some fixes 
[ci skip]
 2016-02-10 15:07:11 +01:00
Tomasz Maczukin efedf983a1 Fix builds API formatting 
[ci skip]
 2016-02-10 14:36:51 +01:00
Douglas Barbosa Alexandre 202bf71da8 Change MR link to "View Open Merge Request" 2016-02-10 10:47:59 -02:00
Douglas Barbosa Alexandre 1353cff5fe Replaces "Create merge request" link with one to the MR when one exists 2016-02-10 10:32:25 -02:00
Achilleas Pipinellis 10aa99a30c Merge branch 'doc_relative_url' into 'master' 
Add documentation on relative URL support

closes #12773

See merge request !2770
 2016-02-10 10:51:18 +00:00
Achilleas Pipinellis 464cea7d48 Fix typos and grammar 
[ci skip]
 2016-02-10 12:43:19 +02:00