home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 05:56:37 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
4716 Commits
Author SHA1 Message Date
Tomasz Maczukin 549a2fa787 Modify builds scope filtering in builds API 2016-01-08 14:01:31 +01:00
Dmitriy Zaporozhets 08213ed4f5 Merge branch 'accept-2xx-status-codes-for-webhooks' into 'master' 
Accept 2xx status codes for successful Web hook triggers

Closes https://github.com/gitlabhq/gitlabhq/issues/9956

See merge request !2332
 2016-01-08 10:56:39 +00:00
Robert Schilling 4c90ed52fe Delete tag via API 2016-01-08 10:10:04 +01:00
Rubén Dávila f1f4fdf778 Don't process inline diffs on backend. #3945 2016-01-07 21:08:57 -05:00
Robert Speicher fa36749bce Add two custom Date/Time conversion formats 2016-01-07 20:01:08 -05:00
Robert Speicher 65308a9c15 Add spec for single-item task lists 2016-01-07 15:25:39 -05:00
Robert Speicher 90510f0037 Merge branch 'milestone-ref' into 'master' 
Link to milestone in "Milestone changed" system note

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

See merge request !2203
 2016-01-07 19:22:43 +00:00
Stan Hu 69209612e1 Suppress e-mails on failed builds if allow_failure is set 
Every time I push to GitLab, I get > 2 emails saying a spec failed when
I don't care about benchmarks and other specs that have `allow_failure` set to `true`.
 2016-01-07 10:45:39 -08:00
Dmitriy Zaporozhets 3c93e588e9 Merge branch 'annotate-models-20160105' into 'master' 
Annotate models

Time to refresh the comments via `annotate`.


See merge request !2311
 2016-01-07 18:22:32 +00:00
Tommy Beadle 1f64332e11 Include user_username in user_(add_to/remove_from)_(project/group) system hooks. 2016-01-07 12:54:54 -05:00
Tommy Beadle dada25d447 Include the username in user_create/destroy system hooks. 2016-01-07 12:54:35 -05:00
Tomasz Maczukin e0ec69d919 Change 'trigger_id' to 'token' as resource ID in triggers API 2016-01-07 18:48:33 +01:00
Jacob Schatz 8f6ca70055 fixes ajax issue with issue spec 2016-01-07 12:27:01 -05:00
Douwe Maan 1e927d39b4 Update spec 2016-01-07 15:51:12 +01:00
Stan Hu 8386edafd1 Accept 2xx status codes for successful Web hook triggers 
Closes https://github.com/gitlabhq/gitlabhq/issues/9956
 2016-01-07 06:28:24 -08:00
Yorick Peterse 9b0c360bd5 Fixed issue sorting specs for ID changes 
These specs assumed data was still sorted by timestamp, instead of by
ID.
 2016-01-07 14:53:02 +01:00
Yorick Peterse 61561a9eeb Merge branch 'remove-more-influxdb-tags' into 'master' 
See merge request !2328
 2016-01-07 13:38:42 +00:00
Tomasz Maczukin b60c146267 Change :variable_id to :key as resource ID in API 2016-01-07 13:49:38 +01:00
Douwe Maan 1886d727f7 Add API project upload endpoint 2016-01-07 13:37:14 +01:00
Yorick Peterse 7b10cb6f0f Store request methods/URIs as values 
Since filtering by these values is very rare (they're mostly just
displayed as-is) we don't need to waste any index space by saving them
as tags. By storing them as values we also greatly reduce the number of
series in InfluxDB.
 2016-01-07 13:05:00 +01:00
Jacob Vosmaer 41b8a238ce Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-01-07 12:56:18 +01:00
Yorick Peterse 364b07cff0 Removed UUIDs from metrics transactions 
While useful for finding out what methods/views belong to a transaction
this might result in too much data being stored in InfluxDB.
 2016-01-07 12:44:15 +01:00
Douwe Maan 539b41929b Milestone reference is a Markdown link 2016-01-07 12:26:05 +01:00
Yorick Peterse 7ed3a5a240 Revert "Store SQL/view timings in milliseconds" 
This reverts commit 7549102bb7.

Apparently I was wrong about
ActiveSupport::Notifications::Event#duration returning the duration in
seconds, instead it returns it in milliseconds already.
 2016-01-07 11:47:06 +01:00
Robert Speicher d47b3e63d5 Merge branch 'more-opengraph' into 'master' 
Add Open Graph data for group, project and commit.

See merge request !2211
 2016-01-06 19:11:05 +00:00
Robert Speicher 623fa2caf7 Merge branch 'fix-banzai-cache' into 'master' 
Fix mentionable reference extraction caching.

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

Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283

See merge request !2315
 2016-01-06 18:11:46 +00:00
Ted Hogan f0c2f7481f Removed redundent and incorrect tests on WIP 2016-01-06 10:48:08 -07:00
Tommy Beadle 4d41294d71 Include the user_id in user_*_team system hooks. 
This fixes an issue where the user_id is not included in the data for
user_add_to_team and user_remove_from_team system hooks.  The documentation
already states that the user_id should be included.
 2016-01-06 11:49:59 -05:00
Yorick Peterse 7549102bb7 Store SQL/view timings in milliseconds 
Transaction timings are also already stored in milliseconds, this keeps
things consistent.
 2016-01-06 16:37:14 +01:00
Jose Corcuera 0b2fa3bfa4 Fix problem with projects ending with .keys #3076 2016-01-06 09:54:43 -05:00
Stan Hu 79c0e7212a Annotate models 2016-01-06 13:09:55 +00:00
Douwe Maan 7884a26176 Merge branch 'import-gh-pull-requests' into 'master' 
Import GitHub Pull Requests into GitLab

Fixes #2833

See merge request !2168
 2016-01-06 12:58:32 +00:00
Jacob Schatz f71642017e adds tests (and passes them) for ajax open and close merge requests. 2016-01-06 07:33:50 -05:00
Douwe Maan 18b17072c6 Add regression test. 2016-01-06 13:33:47 +01:00
Douwe Maan 2474a5921f Merge branch 'master' into milestone-ref 2016-01-06 13:06:50 +01:00
Douwe Maan 639d428046 Merge branch 'master' into more-opengraph 2016-01-06 13:06:25 +01:00
Douwe Maan 384445eca6 Don't override issue page description in project layout. 2016-01-06 13:02:51 +01:00
Robert Speicher 43053c2e6f Make page_description less magical ✨ 2016-01-05 14:54:59 -05:00
Robert Speicher a298f69432 Use User#avatar_url instead of avatar_icon helper 2016-01-05 14:50:52 -05:00
Douglas Barbosa Alexandre 837a9065f0 Ensure that we're only importing local pull requests 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre 98909dd12c Generate separate comments when importing GitHub Issues into GitLab 2016-01-05 15:24:55 -02:00
Douglas Barbosa Alexandre dc72a8b305 Refactoring GithubImport::Importer 2016-01-05 15:24:55 -02:00
Douwe Maan b541446389 Fix notification spec 2016-01-05 18:17:55 +01:00
Douwe Maan 8de1f7159c Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' 
Better support for referencing and closing issues in asana_service.rb (by @mikew1)



See merge request !2302
 2016-01-05 16:10:16 +00:00
Douwe Maan 0b66151632 Remove icon from milestone reference. 2016-01-05 16:45:53 +01:00
Douwe Maan fd91b48f24 Merge branch 'master' into milestone-ref 2016-01-05 16:40:23 +01:00
Douwe Maan 7a3b762978 Merge branch 'master' into more-opengraph 
# Conflicts:
#	app/views/layouts/_head.html.haml
 2016-01-05 16:35:18 +01:00
Douwe Maan 0bab4788ef Satisfy Rubocop 2016-01-05 16:31:05 +01:00
Tomasz Maczukin 962b97d813 Merge branch 'master' into ci/api-builds 
* master: (75 commits)
  Fix grammar
  Clarify the key generation step
  Remove misleading `ssh-dsa`
  markdown fixes
  markdown fixes
  Add `AbuseReport#notify`
  Make AbuseReportMailer responsible for knowing if it should deliver
  Redirect back to user profile page after abuse report
  Redesign the AbuseReports index
  Don't notify users twice if they are both project watchers and subscribers
  Restructure logo JS to use `setInterval`
  Decrease the logo sweep delay
  Correct the logo ID names
  Update CHANGELOG
  Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification
  Remove jquery.blockUI.js plugin
  rempves tests for "you have master access" text
  Revert "Merge branch 'rs-remove-jquery-blockui' into 'master'
"
  removes footer message about access to project
  remove public field from namespace and refactoring
  ...
 2016-01-05 15:53:34 +01:00
Douwe Maan 9b1270280a Merge branch 'rs-abuse-reports-refactor' into 'master' 
Abuse Report refactors

- Redirect back to user profile after report
- "Tell, Don't Ask" for sending report notifications

See merge request !2293
 2016-01-05 14:11:15 +00:00