home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
27,802 Commits 48 Branches 340 Tags
fc329696e269044a9b366dbd5135aedca93bccd4
Commit Graph
4059 Commits
Author SHA1 Message Date
James Lopez 3929972d90 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 
# Conflicts:
#	app/controllers/import/gitlab_project_controller.rb
 2016-05-03 13:14:31 +02:00
James Lopez 9d306eb132 picking stuff from ui related to import 2016-05-03 12:41:23 +02:00
James Lopez 548c91e3c5 Merge branch 'feature/project-export' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 
# Conflicts:
#	lib/gitlab/import_export/command_line_util.rb
 2016-05-03 11:34:13 +02:00
James Lopez 2a78e03ad5 Merge branches 'feature/project-export' and 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-05-03 11:15:38 +02:00
James Lopez 58b0b1a661 picking export stuff from the UI branch 2016-05-03 11:13:10 +02:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
James Lopez 5a4f576359 fixing issues with project members mapping. Also added some more JS magic to the import page 2016-05-02 18:22:18 +02:00
James Lopez 07ab6c2e26 refactoring and fixing a bunch of stuff 2016-05-02 11:29:21 +02:00
James Lopez 7ebf22e002 more refactoring and fixes - fixing spec as well 2016-04-29 15:15:27 +02:00
James Lopez c46f3bcb51 few fixes and new integration spec -WIP 2016-04-29 13:11:07 +02:00
Zeger-Jan van de Weg ad99404d25 Properly handle bigger files 2016-04-28 21:28:39 +02:00
James Lopez c5bc262981 few fixes - import from UI working 2016-04-28 18:00:30 +02:00
Achilleas Pipinellis c73bf28143 Replace gitlab-workhorse with GitLab Workhorse where appropriate 2016-04-28 17:36:50 +03: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
James Lopez 5908bdf3ed fixing a few tar issues - and using gnu tar only 2016-04-28 13:53:16 +02: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
James Lopez cec4ae55b7 quite a few fixes - import service 2016-04-27 18:07:40 +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
James Lopez cbbc42e0c4 adding more UI changes, updated controller, worker and refactored import service 2016-04-26 17:12:50 +02:00
Marin Jankovski 2f5394f5d6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-04-26 11:08:56 +02:00
Robert Speicher 29a23a4478 Merge branch '15579-filter-milestone-confidential-issues-api' into 'master' 
Prevent information disclosure via milestone API

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

See merge request !1961
 2016-04-26 00:37:01 +00:00
Robert Speicher 7e47f8762e Merge branch 'fix-private-snippet-api' into 'master' 
Prevent information disclosure via snippet API

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

See merge request !1958
 2016-04-25 20:30:11 +00:00
Jacob Schatz 8fc0eed357 Merge branch 'emoji-unicode-fix' into 'master' 
Fixes issue with emoji comments not showing correct emoji image

Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512

See merge request !3885
 2016-04-25 20:04:35 +00: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
Stan Hu d5267dfd0d Prevent private snippets in public/internal projects from being leaked via API 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15580
 2016-04-25 12:02:06 -07:00
Dmitriy Zaporozhets b79c5c40e1 Merge branch 'rs-503-page' into 'master' 
Add a branded 503 static error page

[ci skip]

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

See merge request !3894
 2016-04-25 17:13:23 +00:00
James Lopez 4037a73894 Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-04-25 18:06:24 +02:00
James Lopez 22ff009a54 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-import 2016-04-25 18:01:58 +02:00
James Lopez 10f1609535 changes to be picked by the UI branch 2016-04-25 18:00:15 +02:00
Stan HuandRémy Coutable 03ae2cdbff Filter confidential issues from milestones API if user does not have access 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15579
 2016-04-25 12:20:29 +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
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
Phil Hughes 13f7ba059e Removed usage of normilizeEmojiName method 
Fixed some Ruby based on feedback
 2016-04-22 21:53:26 +01:00
Robert Speicher d85f65ef4e Add a branded 503 static error page 
[ci skip]

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15398
 2016-04-22 16:26:42 -04:00
Tomasz Maczukin 9a1b174d5c Fix some typos 2016-04-22 22:08:38 +02:00
Tomasz Maczukin a2e2989637 Modify code formatting 2016-04-22 22:08:37 +02:00
Tomasz Maczukin 0ccf629525 Simplify the GitlabCiYamlProcessor#initial_parsing method 2016-04-22 22:08:36 +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
Phil Hughes 319c936055 Fixes issue with emoji comments not showing correct emoji image 
Previously it would look for the unicode character inside the award menu. But this menu might not always be there.

Now, the unicode characters are loaded onto the page in an array which the award emoji that looks in to get the correct emoji unicode character

Fixes #15512
 2016-04-22 17:01:53 +01:00
James Lopez acf297955a gitlab import UI - icon, file selector, etc... Also updated font-awesome and modified import source settings. 2016-04-22 17:44:59 +02:00
James Lopez b18bd9c85f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental 2016-04-22 17:02:29 +02:00
James Lopez a0ede57dd6 Merge branches 'feature/project-export' and 'feature/project-import' into feature/project-export-ui-experimental 2016-04-22 15:29:35 +02:00
James Lopez fedfba5519 more refactoring - easier guessing path changes 2016-04-22 12:49:37 +02:00
James Lopez 8f973b8f68 more refactoring - easier guessing path changes 2016-04-22 12:45:20 +02:00
James Lopez 45032bf403 Merge branch 'feature/project-export' into feature/project-import 2016-04-22 12:18:47 +02:00
James Lopez 4256743686 refactored path stuff 2016-04-22 12:18:11 +02:00
Robert Speicher 1ea2408ba3 Merge branch 'dev_issue_15331' into 'master' 
Fixes window.opener bug

Adds `noreferrer` value to rel attribute for external links

REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15331

See merge request !1953
 2016-04-21 20:49:41 +00:00
Alfredo Sumaran 72debd840c Fix failing spec 2016-04-21 14:38:44 -05:00
Alfredo Sumaran 3b39214f29 Merge remote-tracking branch 'origin/master' into issue_14904 2016-04-21 12:47:32 -05:00
James Lopez 2d503f6410 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-04-21 17:37:33 +02:00