home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,627 Commits 48 Branches 340 Tags
ade40fdcd2a4ee879bd2aba939cffaff39c65228
Commit Graph
5014 Commits
Author SHA1 Message Date
Timothy Andrew ade40fdcd2 Authenticate non-API requests with personal access tokens. 
- Rename the `authenticate_user_from_token!` filter to
  `authenticate_user_from_private_token!`
- Add a new `authenticate_user_from_personal_access_token!` filter
- Add tests for both.
 2016-04-28 22:28:36 +05:30
Timothy Andrew e5cf527f27 Allow expiration of personal access tokens. 2016-04-28 22:28:36 +05:30
Timothy Andrew 1541d1de18 Rename api_helpers_spec to api_authentication_spec 
- And fix all tests.
 2016-04-28 22:28:36 +05:30
Timothy Andrew e8314ccca5 Refactor API::Helpers into API::Helpers::Core and API::Helpers::Authentication 2016-04-28 22:28:36 +05:30
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
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
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
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
Alfredo Sumaran d2f898e7ea Fix Todos test 2016-04-27 14:52:51 -05: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
Grzegorz Bizon bdb86ea6cf Render canceled status if any of the jobs canceled 
This status will be returned only when there are no failed jobs
that are not allowed to fail.
 2016-04-27 14:16:01 +02:00
Stan Hu eede032345 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.
 2016-04-26 21:00:55 -07:00
Alfredo Sumaran 5ba79f49a4 Syntax and code improvements 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 7f263ca1de Use variables instead of let 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 0392dffdb6 Update wording 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 89df29e09f Use click_link 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 5d5df26ab1 Add documentation for "Hide whitespace changes" button 2016-04-26 14:01:40 -05:00
Alfredo Sumaran a1a9a1cf8d Specs for toggle Whitespaces Changes 2016-04-26 14:01:40 -05:00
Connor Shea c402aeef02 Allow alternative names for the CHANGELOG file. 
"CHANGELOG", "NEWS", "HISTORY", and "CHANGES" are recognized as Changelog files.

Also adds relevant tests for each of these names.

Resolves #14864.
 2016-04-26 11:40:35 -06:00
Jacob Vosmaer 3c0ab15a74 Do not fsck projects less than a day old 
This should bring the number of false positives down.
 2016-04-26 13:35:52 +02:00
Jacob Vosmaer f127edd012 Merge branch '15094-throttle-update-of-last_activity_at' into 'master' 
Throttle the update of `project.last_activity_at` to 1 minute

This implement [the solution](https://gitlab.com/gitlab-org/gitlab-ce/issues/15094#note_4769387) proposed by @jacobvosmaer.

See merge request !3848
 2016-04-26 09:34:51 +00:00
Phil Hughes 3e40b88547 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
 2016-04-26 09:35:58 +01:00
Phil Hughes 0158b86d8c Updated label links to work correctly for filtering 
See !3846#note_5033951
 2016-04-26 09:13:03 +01:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master' 
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
 2016-04-25 19:13:25 +00:00
Rémy Coutable 533cd8c2ee Throttle the update of project.last_activity_at to 1 minute 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-25 17:25:46 +02:00
Grzegorz Bizon ef032bb9f1 Fix error on commit builds page when no builds yet 
Closes #15509
 2016-04-25 17:19:57 +02:00
Stan Hu 6dff1a9a2b Fix Error 500 due to stale cache when projects are renamed or transferred 
Closes gitlab-org/gitlab-ee#506
 2016-04-25 06:57:50 -07:00
Rémy Coutable abf15a9646 Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq 2016-04-25 11:57:38 +02:00
Rémy Coutable 41aa7a89fb Merge branch 'fix-project-hook-delete-permissions' into 'master' 
Prevent users from deleting Webhooks via API they do not own

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

See merge request !1959
 2016-04-25 09:26:58 +00:00
Rémy Coutable b8c4a65da7 Fix license detection to detect all license files, not only known licenses 
Fixes #15470.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-25 10:31:28 +02:00
Stan Hu 9413dd80f5 Prevent users from deleting Webhooks via API they do not own 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15576
 2016-04-24 23:53:59 -07:00
Tomasz Maczukin 9a1b174d5c Fix some typos 2016-04-22 22:08:38 +02:00
Tomasz Maczukin e1b3ce5468 Fix formatting 2016-04-22 22:08:35 +02:00
Tomasz Maczukin 8dd27b47ea Add posibility to define a hidden job without 'script' in .gitlab-ci.yml 2016-04-22 22:08:34 +02:00
Robert Speicher d83d43c553 Merge branch 'rs-todos-feature-spec' into 'master' 
Refactor Todos feature spec to be faster and less brittle

We now only create two Todos instead of 21 when testing pagination, and
we've updated the test to be less brittle when dealing with slower CI
environments.

See merge request !3889
 2016-04-22 17:51:08 +00:00
Robert Speicher 84d3649d57 Merge branch '15513-fix-undefined-can-method' into 'master' 
Use the `can?` helper instead of `current_user.can?`

Fixes #15513.

See merge request !3882
 2016-04-22 17:38:10 +00:00
Robert Speicher bdd844f312 Refactor Todos feature spec to be faster and less brittle 
We now only create two Todos instead of 21 when testing pagination, and
we've updated the test to be less brittle when dealing with slower CI
environments.
 2016-04-22 13:08:11 -04:00
Robert Speicher 10aaea1c91 Merge branch 'fix/cherry-pick-specs-location' into 'master' 
Move cherry-pick feature specs to proper directory

Cherry pick feature specs were located in `spec/feature/project` directory while we have `spec/feature/projects`.

Later location is consistent with our namespaces (we have `Projects::` namespace, not `Project::`).

See merge request !3875
 2016-04-22 15:33:23 +00:00
Rémy Coutable c56ae831db Merge branch 'issue_3799' into 'master' 
Add tests for filtering owned projects

REF: #3799

See merge request !3873
 2016-04-22 15:11:14 +00:00
Rémy Coutable 951e3459e1 Use the can? helper instead of current_user.can? 
Fixes #15513.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-22 15:48:58 +02:00
Alfredo Sumaran 21a1e15677 Merge remote-tracking branch 'origin/master' into issue_3799 2016-04-22 08:37:15 -05:00
Phil Hughes 32be8bd2b1 Fixed issue with assignee object not being returned 
Closes #15515
 2016-04-22 13:30:58 +01:00
Grzegorz Bizon b711fc0abd Move cherry-pick feature specs to proper directory 2016-04-22 13:34:03 +02:00
Alfredo Sumaran e0c07b5e3d Add tests for filtering owned projects 2016-04-22 06:19:43 -05:00
Rémy Coutable d5398e9656 Merge branch 'issue_3799' into 'master' 
Allow filtering by Owned projects on dashboard page

Closes #3799 

![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png)

See merge request !3762
 2016-04-22 08:40:01 +00:00