Commit Graph
27643 Commits
Author SHA1 Message Date
Rémy Coutable b8f28628f5 Merge branch 'fix/remove-deprecated-ci-helper' into 'master'
Remove deprecated CI badge helper

Closes #13446

See merge request !3977
2016-04-29 11:09:34 +00:00
Rémy Coutable 1c0aef4464 Merge branch 'change_message_for_newly_created_milestone' into 'master'
Use a better message when milestone is newly created

closes #14982

See merge request !3925
2016-04-29 10:51:10 +00:00
Yorick Peterse 6d716fbd4d Merge branch 'fix-changelog' into 'master'
Fixed CHANGELOG for 8.7.1/8.7.2

See merge request !3978
2016-04-29 10:45:22 +00:00
Yorick Peterse 39ed7c18e9 Fixed CHANGELOG for 8.7.1/8.7.2
[ci skip]
2016-04-29 12:44:23 +02:00
Jacob Schatz 4997a1e321 Merge branch 'dz-update-outdated-colors' into 'master'
Replace outdated bluish colors with default bg color

cc @skyruler 

See merge request !3973
2016-04-29 10:37:17 +00:00
Grzegorz Bizon 0ea9e47722 Remove deprecated CI badge helper
Closes #13446
2016-04-29 12:21:20 +02:00
Arinde Eniola ded3b02f33 Use a better message when milestone is newly created
make some changes for the checks to determine when the messages should be displayed

add item to changelog and also integration test

make some changes to the test

make some changes
2016-04-29 10:15:49 +01:00
Robert Speicher 10f84f99cb Merge branch 'zj-large-files-no-highlight' into 'master'
Properly handle bigger files

Closes #3967

See merge request !3718
2016-04-28 21:33:50 +00:00
Dmitriy Zaporozhets 9ef18c6c8b Replace outdated bluish colors with default bg color 2016-04-28 23:06:00 +02:00
Jacob Schatz 73990df32f Merge branch 'async-new-branch-button' into 'master'
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
2016-04-28 21:00:22 +00:00
Jacob Schatz 9bccb4c951 Merge branch 'protected-branches-ui' into 'master'
Protected branches UI

![Screen_Shot_2016-04-26_at_15.50.10](/uploads/4b905db031aab412bc01616e0be36c1b/Screen_Shot_2016-04-26_at_15.50.10.png)

![Screen_Shot_2016-04-26_at_15.50.00](/uploads/b09229b364ec5361fce375299d39d99c/Screen_Shot_2016-04-26_at_15.50.00.png)

Closes #14027

See merge request !3929
2016-04-28 20:17:41 +00:00
Jacob Schatz 14c2c573a3 Merge branch 'project-webhooks-ui' into 'master'
Project webhooks updated UI

Closes #13993 

![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png)

![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png)

See merge request !3922
2016-04-28 20:16:36 +00:00
Jacob Schatz bdcba43873 Merge branch 'project-deploy-keys-ui' into 'master'
Project deploy keys updated UI

Closes #13992

See merge request !3912
2016-04-28 20:16:04 +00:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
2016-04-28 16:13:48 -04:00
Jacob Schatz ed08bfdc26 Merge branch 'scss-url-linters' into 'master'
Enable the UrlFormat and UrlQuotes SCSS Linters.

There were no lints to fix for this one, so it's just preventative.

UrlFormat: URLs should be valid and not contain protocols or domain names.

UrlQuotes: URLs should always be enclosed within quotes.

cc: @jschatz1 

See merge request !3770
2016-04-28 19:59:53 +00:00
Zeger-Jan van de Weg ad99404d25 Properly handle bigger files 2016-04-28 21:28:39 +02:00
Jacob Schatz 3fd0f53744 Merge branch 'changelog-update' into 'master'
Add Safari search box bug fix to changelog



See merge request !3951
2016-04-28 19:25:50 +00:00
Jacob Schatz 48076c9808 Merge branch 'updated-triggers-ui' into 'master'
Updated triggers UI

![Screen_Shot_2016-04-27_at_14.05.35](/uploads/971bc907f62abd397368c8c088ff0cf1/Screen_Shot_2016-04-27_at_14.05.35.png)

![Screen_Shot_2016-04-27_at_14.05.32](/uploads/5e0e87998e25e7e89cdd6fb8d6035542/Screen_Shot_2016-04-27_at_14.05.32.png)

Closes #14090

See merge request !3946
2016-04-28 19:14:41 +00:00
Jacob Schatz 973b948b9e Merge branch 'project-group-ui' into 'master'
Project group UI

Closes #13991 

![Screen_Shot_2016-04-25_at_14.54.49](/uploads/e55fd1731a479d93660a1ff8359f56d6/Screen_Shot_2016-04-25_at_14.54.49.png)

See merge request !3911
2016-04-28 16:44:41 +00:00
Robert Speicher 8ab6ca8281 Merge branch 'todos-tests-fix' into 'master'
Fix Todos test

Another attempt to fix random fail on Todos test.

See merge request !3953
2016-04-28 16:09:05 +00:00
Dmitriy Zaporozhets ce92b3d342 Merge branch 'navigation-redesign' into 'master'
Grey header and fluid profile navigation

Based on https://gitlab.com/gitlab-org/gitlab-ce/issues/14838#note_5083863 

cc @skyruler

See merge request !3968
2016-04-28 16:03:29 +00:00
Jacob Vosmaer (GitLab) 15aea85a71 Merge branch 'initd_gitlab_workhorse_rename' into 'master'
Replace gitlab-workhorse with GitLab Workhorse where appropriate

For the output to be consistent with the other services.

See merge request !2512
2016-04-28 15:24:05 +00:00
Rémy Coutable e675bb0aa6 Merge branch 'allow-disabling-of-rack-attack' into 'master'
Disable Rack Attack if admin disables it in config file

Grack::Auth already checks this variable. These holdouts were not disabled, leading to confusion when debugging a customer issue.

See merge request !3918
2016-04-28 15:14:14 +00:00
Dmitriy Zaporozhets 435b1c043e Reuse more popular colors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-28 17:03:03 +02:00
Achilleas Pipinellis c73bf28143 Replace gitlab-workhorse with GitLab Workhorse where appropriate 2016-04-28 17:36:50 +03:00
Jacob Vosmaer (GitLab) 872e854840 Merge branch 'prepend-letter-v-to-workhorse-version-numbers' into 'master'
Prepend letter v to GitLab Workhorse version numbers

This helps to address gitlab-org/gitlab-ce#12684 so as to maintain consistency in all GitLab projects.

It also addresses: https://gitlab.com/gitlab-org/gitlab-workhorse/issues/4

Next Steps

- create a set of duplicate tags in workhorse to prevent errors when updating from the patch guide


See merge request !3088
2016-04-28 14:12:47 +00:00
Rémy Coutable a291e01508 Merge branch 'fix/ci-skipped-status' into 'master'
Build status `canceled` if any of the jobs canceled

Before this change in case of any of the jobs had been canceled, build status was `failed`.

Closes #14207

See merge request !3778
2016-04-28 13:56:04 +00:00
Grzegorz Bizon 40a25732e9 Reorder asserts is ci commits specs for consistency 2016-04-28 15:15:59 +02:00
Rémy Coutable 5addff7e6c Merge branch 'use-remote-ip-for-akismet' into 'master'
Use ActionDispatch Remote IP for Akismet checking

Previously all remote IPs appeared at 127.0.0.1, which made Akismet
not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html)
should provide more reliable results.

Closes #16629

See merge request !3961
2016-04-28 13:09:44 +00:00
Rémy Coutable d4668825e4 Merge branch 'label_feature_proposal' into 'master'
Users can use the feature proposal label inside the issue

Got the idea from https://gitlab.com/gitlab-org/gitlab-ce/issues/12620.

\cc @JobV @sytses 

See merge request !2574
2016-04-28 12:38:54 +00:00
Dmitriy Zaporozhets 4a3f3bc702 Make layout navigation gray and fluid
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-28 14:23:25 +02:00
Dmitriy Zaporozhets adc296e936 Make application header light gray
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-28 14:13:37 +02:00
Jacob Vosmaer aacb485535 Merge branch 'admin-email-frequency' into 'master'
Send 'admin emails' weekly, not daily

Daily seems to be to spammy, so let's default to weekly instead.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15520

See merge request !3923
2016-04-28 11:07:42 +00:00
Achilleas Pipinellis da4aaaacd7 Fix links to core team page
[ci skip]
2016-04-28 14:06:28 +03:00
Achilleas Pipinellis 45f4cc6e9b Merge branch 'fix/docker-in-docker-ci-documentation' into 'master'
Update using_docker_build.md, clarify the 'privileged' mode requirement

Related to #15428

Fixes gitlab-org/gitlab-ci-multi-runner#1261

See merge request !3909
2016-04-28 10:59:20 +00:00
Grzegorz Bizon 83883f426e Add Changelog entry for build status canceled fix 2016-04-28 12:49:46 +02:00
Grzegorz Bizon 60492caa98 Add tests exercising builds scheduler after cancel 2016-04-28 12:49:46 +02:00
Grzegorz Bizon 7518330aa1 Refactor ci commit specs by adding context blocks 2016-04-28 12:49:35 +02:00
Achilleas Pipinellis 8b09dafb16 Copyedit using_docker_build.md and fix links 2016-04-28 13:04:53 +03:00
Achilleas Pipinellis 8b817f5940 Users can use the feature proposal label inside the issue
[ci skip]
2016-04-28 12:43:23 +03:00
Rémy Coutable 7aff855bc7 Merge branch 'fix-github-enterprise-imports' into 'master'
Backport GitHub Enterprise import support from EE

These changes were pulled from GitLab EE to support configuring
an alternative API URL than the default https://api.github.com.
In addition, the `verify_ssl` flag allows users to disable SSL cert
checking.

One modification: add a default `args` option if it does not exist
to avoid breaking existing configurations.

See merge request !3892
2016-04-28 09:37:13 +00:00
Stan Hu e99cf05875 Use ActionDispatch Remote IP for Akismet checking
Previously all remote IPs appeared at 127.0.0.1, which made Akismet
not very useful. Using the ActionDispatch Remote IP (http://api.rubyonrails.org/classes/ActionDispatch/RemoteIp.html)
should provide more reliable results.

Closes #16629
2016-04-27 22:12:55 -07:00
Jacob Schatz a792427eed Merge branch 'add-js-prefix-to-user-tab-classes' into 'master'
Add JS prefix to user tab classes

## What does this MR do

This MR adds the `js-` prefix to the classes which are used for js purposes only. This MR only affects the said classes inside `users/show.html.haml`.

## Are there points in the code the reviewer needs to double check?

I'm not entirely sure if this project uses the `js-` prefix for
classes that are used for js purposes only. Doing a grep shows some of the classes have the prefix, but I'm still unsure whether this project follows this rule.

## Why was this MR needed?

As I was working thru #13401, I wanted to add a tab on the user profile page to show the contributions outside the GitLab instance. Reading the JS, I came across this. This MR helps new people reading the code that the said classes are for js purposes only. Also, it helps the project work toward to uniform class naming.

I suggest that we document adding the `js-` prefix to classes for js purposes only (if this is the case for this project)

See merge request !3928
2016-04-27 21:30:42 +00:00
Alfredo Sumaran d2f898e7ea Fix Todos test 2016-04-27 14:52:51 -05:00
Achilleas Pipinellis 2ec58d4a74 Merge branch 'trigger-query-string' into 'master'
Add API doc example with query string for triggering build

Make this explicit to prevent confusion as we saw in gitlab-org/gitlab-ci#413.

See merge request !3947
2016-04-27 19:24:18 +00:00
Achilleas Pipinellis 0863644a90 Merge branch 'fix-operations-doc' into 'master'
Sidekiq MemoryKiller sends a `SIGKILL` signal, not `SIGTERM`

As documented in https://gitlab.com/gitlab-org/gitlab-ce/blob/f127edd012bd8b6f76ac67d69aadbd7d4837258f/lib/gitlab/sidekiq_middleware/memory_killer.rb#L10 (this was changed by c291ff9c6f).

See merge request !3927
2016-04-27 18:05:30 +00:00
Jacob Schatz 90c966500a Merge branch 'project-dropdown-tests' into 'master'
Project title dropdown tests

Added a test for when on an issue page to check whether the project
dropdown links will still work

See !3870

See merge request !3921
2016-04-27 17:28:48 +00:00
Jacob Schatz 1b35955e0b Merge branch 'sidebar-label-link' into 'master'
Updated label links to work correctly for filtering

See !3846#note_5033951

See merge request !3920
2016-04-27 17:25:32 +00:00
Jacob Schatz 7640e60a50 Merge branch 'esc-close-dropdown' into 'master'
Escape key closes the dropdown

Fixes #15432 

![esc](/uploads/067e32bcaf265c3241d84dcbd3f11532/esc.gif)

See merge request !3904
2016-04-27 16:11:31 +00:00
Annabel Dunstone 129c6fbc2d Add Safari search box bug fix to changelog 2016-04-27 10:48:29 -05:00