home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,774 Commits 48 Branches 340 Tags
8172d5ca54f908d5ce9975dd18fb9bea0c992dbb
Commit Graph
23774 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nemanja Boric 8172d5ca54 Don't try to mark broken MR as mergable 
In case merge request is broken, we shouldn't check if the sha
is mergable, as it will be null, and there's no point, as we know
that it's not mergable.
 2016-02-11 00:38: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
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
Yorick Peterse 17240f80cb Merge branch 'update-install-documentation-8.5' into 'master' 
Updated install/update guides for 8.5



See merge request !2766
 2016-02-10 10:24:04 +00:00
Yorick Peterse 3d1d96bb4f Updated install/update guides for 8.5 
[ci skip]
 2016-02-10 11:02:04 +01:00
Bram DaamsandRémy Coutable d146d9fd83 Add assignee data to Issuables' hook_data 2016-02-10 09:40:00 +01:00
Dmitriy Zaporozhets 22808a2221 Merge branch 'fix-explore-filter' into 'master' 
Add ajax filtering to all paged project lists. Fixes #13182



See merge request !2728
 2016-02-10 08:31:36 +00:00
Robert Speicher 93d62bb8af Merge branch 'rs-issue-13254' into 'master' 
Ensure link for README blobs includes the full path

Closes #13254

See merge request !2774
 2016-02-10 01:29:13 +00:00
Josh Frye cf8a74be5f Cleanup to use one selector 2016-02-09 20:21:47 -05:00
Josh Frye 929b53c6f2 More specific selectors 2016-02-09 18:01:32 -05:00
Robert Speicher d1f10c6666 Ensure link for README blobs includes the full path 
Closes #13254
 2016-02-09 17:56:15 -05:00
Robert Speicher 4317b22741 Merge branch 'variables-build-log' into 'master' 
Add notice about variables in build log

Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942

[ci skip]

See merge request !2761
 2016-02-09 21:34:46 +00:00
Robert Speicher 94feb4da9d Merge branch 'fix-logo-rasterization' into 'master' 
Prevent rasterization artifacts in the logo, and simplify markup.

 - Remove sketch-namespaced attributes.
 - Remove unused groups, and cancel out unnecessary transforms.
 - Use overlap to avoid rasterization artifacts in the logo.
 - Remove viewBox parameter and define paths in their final form.

See merge request !2741
 2016-02-09 21:07:54 +00:00
Robert Speicher f3324936c3 Update CHANGELOG 
[ci skip]
 2016-02-09 14:59:39 -05:00
Robert Speicher 069937d2c7 Merge branch 'freeze-constants-lib-gitlab-git' into 'master' 
Freeze constants in Gitlab::Git

See merge request !1730
 2016-02-09 18:14:50 +00:00
Douwe Maan 883bbd61ca Merge branch 'smarter-diverging-commit-cache-flushing' into 'master' 
Smarter flushing of branch statistics caches

This basically ensures we only flush caches of branches whenever we really have to. See commit c514f8b850219cd3e5526e73e1d00e6729e2b466 for the details.

cc @joshfng @rspeicher 

See merge request !2769
 2016-02-09 17:19:12 +00:00
Robert Speicher c8b6ec47ad Merge remote-tracking branch 'github/master' into 'master' 2016-02-09 12:14:19 -05:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Douwe Maan d77c3cff36 Merge pull request #10023 from bozaro/smtp-port 
Change default smpt port to 465 (default smtps port)
 2016-02-09 17:22:47 +01:00
Yorick Peterse 2ce0d06389 Smarter flushing of branch statistics caches 
Instead of flushing the behind/ahead counts for all branches upon every
push we now only flush the cache of branches that actually need to have
these statistics recalculated. There are now basically 2 scenarios and
their effects:

1. A user pushes a commit to the default branch, this results in the
   cache being flushed for all branches.
2. A user pushes to a non default branch, this results in _only_ the
   cache for that branch being flushed.

The existing code (Repository#expire_cache) remains backwards compatible
with the previous behaviour, the new behaviour is only applied when a
branch name is passed as an argument. This ensures that when for example
a project is deleted the cache for all branches is flushed.
 2016-02-09 17:17:56 +01:00
Douwe Maan a52c5778bb Merge branch 'index_snippet' into 'master' 
Add index for snippet's updated_at

@DouweM We are ordering by `updated_at` but there is no index.

cc @yorickpeterse 

See merge request !2768
 2016-02-09 16:12:58 +00:00
Douwe Maan 6b0801d4f3 Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' 
Expose MergeRequest#merge_status

_Originally opened at !2478 by @develop7._

- - -

This enables API users to see whether a merge request can be merged without conflicts.

See merge request !2756
 2016-02-09 16:01:20 +00:00
Douwe Maan f86ff1b833 Merge branch 'fix/max-attachment-size-setting-validation' 2016-02-09 16:52:20 +01:00
Josh Frye 120dca0f35 MR feedback 2016-02-09 10:10:41 -05:00
Josh Frye 8b4e9720d9 Extract events rendering to own action. 2016-02-09 10:10:41 -05:00
Josh Frye 30e022a2fe Starred, All, and Trending on explore are paged also group projects. Need ajax filter. 2016-02-09 10:10:41 -05:00
Josh Frye 0dc64a8ce1 JS Fixes 2016-02-09 10:10:41 -05:00
Josh Frye dd1a683c64 Fix explore filter. Fixes #13182 2016-02-09 10:10:41 -05:00
Achilleas Pipinellis f81495b1e1 Add note on using a custom init script 
[ci skip]
 2016-02-09 17:04:41 +02:00
Achilleas Pipinellis b532109b97 Edit configuration files for relative URL support 
[ci skip]
 2016-02-09 16:59:42 +02:00
Achilleas Pipinellis 41a9575912 Add relative URL documentation 2016-02-09 16:31:38 +02:00
Douwe Maan 706b101f51 Merge branch 'huacnlee/gitlab-ce-feature/option-to-include-author-info-in-mail' into 'master' 
Add option to include the sender name in body of Notify email

_Originally opened at !2495 by @huacnlee._

- - -

Fixes #7824.

See merge request !2767
 2016-02-09 14:12:56 +00:00
Douwe Maan 80352b783c Merge branch '3kami3/gitlab-ce-root_email' into 'master' 
Add an option to supply root email through an environmental variable.

_Originally opened at !2499 by @3kami3._

---

Add an option to supply root email through an environmental variable.

See merge request !2751
 2016-02-09 13:55:52 +00:00
Valery Sizov 6c3cd241e8 Add index for snippet's updated_at 2016-02-09 15:10:22 +02:00
Douwe Maan 643c61867c Merge branch 'zj/gitlab-ce-unique-milestone-title-per-project' 2016-02-09 13:15:37 +01:00
Douwe Maan e0f923a172 Merge branch 'add-tooltip-to-stuck-builds' into 'master' 
Add a tooltip to the stuck warning build symbol

We want to give people an idea of what is wrong with their build, we do this by
adding a tooltip telling them where they can find more information about their
broken builds.

Fixes #10919

See merge request !2680
 2016-02-09 12:12:44 +00:00
Jason LeeandRémy Coutable 9474e36f46 Add option to include the sender name in body of Notify email. fix #7824 2016-02-09 12:58:13 +01:00
Douwe Maan 2837f5c179 Merge branch 'fix/split-ci-jobs' into 'master' 
split gitlab-ci builds for ruby 2.1

Added breakdown of builds for Ruby 2.1 in .gitlab-ci.yml config file.

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

See merge request !2746
 2016-02-09 11:52:24 +00:00
Douwe Maan aacde42d55 Merge branch 'rs-broadcast-markdown' into 'master' 
Allow limited Markdown in Broadcast Messages

Closes #11853

See merge request !2695
 2016-02-09 11:44:08 +00:00
Grzegorz Bizon dd3b9feafa Add Changelog entry for new maximum attachment size validator 2016-02-09 12:18:33 +01:00