Merge branch 'master' into 26900-pipelines-tabs
* master: (361 commits) Code style improvements remove require.context from network_bundle remove require.context from graphs_bundle remove require.context from filtered_search_bundle Ignore two Rails CVEs in bundler:audit job Remove Pages readme Change Pages redirect Add missing index.md to Pages docs Added double newline after file upload markdown insert Reorder main index items in Pages overview remove html comments remove <> wrapping text - part 3 wrapping text - part 2 [ci skip] fix link wrap text - part 1 - [ci skip] typo fix spelling, add intermediate cert link Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag remove link to unfinished video ...
This commit is contained in:
Filipa Lacerda
commit
05c66406ca
|
|
@ -240,7 +240,7 @@ rake db:seed_fu:
|
|||
paths:
|
||||
- log/development.log
|
||||
|
||||
karma:
|
||||
rake karma:
|
||||
cache:
|
||||
paths:
|
||||
- vendor/ruby
|
||||
|
|
@ -281,7 +281,7 @@ bundler:audit:
|
|||
- master@gitlab/gitlabhq
|
||||
- master@gitlab/gitlab-ee
|
||||
script:
|
||||
- "bundle exec bundle-audit check --update --ignore OSVDB-115941"
|
||||
- "bundle exec bundle-audit check --update --ignore OSVDB-115941 CVE-2016-6316 CVE-2016-6317"
|
||||
|
||||
migration paths:
|
||||
stage: test
|
||||
|
|
@ -387,7 +387,7 @@ pages:
|
|||
<<: *dedicated-runner
|
||||
dependencies:
|
||||
- coverage
|
||||
- karma
|
||||
- rake karma
|
||||
- lint:javascript:report
|
||||
script:
|
||||
- mv public/ .public/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
### Background:
|
||||
|
||||
(Include problem, use cases, benefits, and/or goals)
|
||||
|
||||
**What questions are you trying to answer?**
|
||||
|
||||
**Are you looking to verify an existing hypothesis or uncover new issues you should be exploring?**
|
||||
|
||||
**What is the backstory of this project and how does it impact the approach?**
|
||||
|
||||
**What do you already know about the areas you are exploring?**
|
||||
|
||||
**What does success look like at the end of the project?**
|
||||
|
||||
### Links / references:
|
||||
|
||||
/label ~"UX research"
|
||||
|
|
@ -54,6 +54,11 @@ Style/AlignArray:
|
|||
Style/AlignHash:
|
||||
Enabled: true
|
||||
|
||||
# Whether `and` and `or` are banned only in conditionals (conditionals)
|
||||
# or completely (always).
|
||||
Style/AndOr:
|
||||
Enabled: true
|
||||
|
||||
# Use `Array#join` instead of `Array#*`.
|
||||
Style/ArrayJoin:
|
||||
Enabled: true
|
||||
|
|
|
|||
|
|
@ -180,13 +180,6 @@ Security/JSONLoad:
|
|||
Style/AlignParameters:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 27
|
||||
# Cop supports --auto-correct.
|
||||
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
||||
# SupportedStyles: always, conditionals
|
||||
Style/AndOr:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 54
|
||||
# Cop supports --auto-correct.
|
||||
# Configuration parameters: EnforcedStyle, SupportedStyles.
|
||||
|
|
|
|||
204
CHANGELOG.md
204
CHANGELOG.md
|
|
@ -2,6 +2,202 @@
|
|||
documentation](doc/development/changelog.md) for instructions on adding your own
|
||||
entry.
|
||||
|
||||
## 8.17.0 (2017-02-22)
|
||||
|
||||
- API: Fix file downloading. !0 (8267)
|
||||
- Changed composer installer script in the CI PHP example doc. !4342 (Jeffrey Cafferata)
|
||||
- Display fullscreen button on small screens. !5302 (winniehell)
|
||||
- Add system hook for when a project is updated (other than rename/transfer). !5711 (Tommy Beadle)
|
||||
- Fix notifications when set at group level. !6813 (Alexandre Maia)
|
||||
- Project labels can now be promoted to group labels. !7242 (Olaf Tomalka)
|
||||
- use webpack to bundle frontend assets and use karma for frontend testing. !7288
|
||||
- Adds back ability to stop all environments. !7379
|
||||
- Added labels empty state. !7443
|
||||
- Add ability to define a coverage regex in the .gitlab-ci.yml. !7447 (Leandro Camargo)
|
||||
- Disable automatic login after clicking email confirmation links. !7472
|
||||
- Search feature: redirects to commit page if query is commit sha and only commit found. !8028 (YarNayar)
|
||||
- Create a TODO for user who set auto-merge when a build fails, merge conflict occurs. !8056 (twonegatives)
|
||||
- Don't group issues by project on group-level and dashboard issue indexes. !8111 (Bernardo Castro)
|
||||
- Mark MR as WIP when pushing WIP commits. !8124 (Jurre Stender @jurre)
|
||||
- Flag multiple empty lines in eslint, fix offenses. !8137
|
||||
- Add sorting pipeline for a commit. !8319 (Takuya Noguchi)
|
||||
- Adds service trigger events to api. !8324
|
||||
- Update pipeline and commit links when CI status is updated. !8351
|
||||
- Hide version check image if there is no internet connection. !8355 (Ken Ding)
|
||||
- Prevent removal of input fields if it is the parent dropdown element. !8397
|
||||
- Introduce maximum session time for terminal websocket connection. !8413
|
||||
- Allow creating protected branches when user can merge to such branch. !8458
|
||||
- Refactor MergeRequests::BuildService. !8462 (Rydkin Maxim)
|
||||
- Added GitLab Pages to CE. !8463
|
||||
- Support notes when a project is not specified (personal snippet notes). !8468
|
||||
- Use warning icon in mini-graph if stage passed conditionally. !8503
|
||||
- Don’t count tasks that are not defined as list items correctly. !8526
|
||||
- Reformat messages ChatOps. !8528
|
||||
- Copy commit SHA to clipboard. !8547
|
||||
- Improve button accessibility on pipelines page. !8561
|
||||
- Display project ID in project settings. !8572 (winniehell)
|
||||
- PlantUML support for Markdown. !8588 (Horacio Sanson)
|
||||
- Fix reply by email without sub-addressing for some clients from Microsoft and Apple. !8620
|
||||
- Fix nested tasks in ordered list. !8626
|
||||
- Fix Sort by Recent Sign-in in Admin Area. !8637 (Poornima M)
|
||||
- Avoid repeated dashes in $CI_ENVIRONMENT_SLUG. !8638
|
||||
- Only show Merge Request button when user can create a MR. !8639
|
||||
- Prevent copying of line numbers in parallel diff view. !8706
|
||||
- Improve build policy and access abilities. !8711
|
||||
- API: Remove /projects/:id/keys/.. endpoints. !8716 (Robert Schilling)
|
||||
- API: Remove deprecated 'expires_at' from project snippets. !8723 (Robert Schilling)
|
||||
- Add `copy` backup strategy to combat file changed errors. !8728
|
||||
- adds avatar for discussion note. !8734
|
||||
- Add link verification to badge partial in order to render a badge without a link. !8740
|
||||
- Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms. !8752
|
||||
- prevent diff unfolding link from appearing when there are no more lines to show. !8761
|
||||
- Redesign searchbar in admin project list. !8776
|
||||
- Rename Builds to Pipelines, CI/CD Pipelines, or Jobs everywhere. !8787
|
||||
- dismiss sidebar on repo buttons click. !8798 (Adam Pahlevi)
|
||||
- fixed small mini pipeline graph line glitch. !8804
|
||||
- Make all system notes lowercase. !8807
|
||||
- Support unauthenticated LFS object downloads for public projects. !8824 (Ben Boeckel)
|
||||
- Add read-only full_path and full_name attributes to Group API. !8827
|
||||
- allow relative url change without recompiling frontend assets. !8831
|
||||
- Use vue.js Pipelines table in commit and merge request view. !8844
|
||||
- Use reCaptcha when an issue is identified as a spam. !8846
|
||||
- resolve deprecation warnings. !8855 (Adam Pahlevi)
|
||||
- Cop for gem fetched from a git source. !8856 (Adam Pahlevi)
|
||||
- Remove flash warning from login page. !8864 (Gerald J. Padilla)
|
||||
- Adds documentation for how to use Vue.js. !8866
|
||||
- Add 'View on [env]' link to blobs and individual files in diffs. !8867
|
||||
- Replace word user with member. !8872
|
||||
- Change the reply shortcut to focus the field even without a selection. !8873 (Brian Hall)
|
||||
- Unify MR diff file button style. !8874
|
||||
- Unify projects search by removing /projects/:search endpoint. !8877
|
||||
- Fix disable storing of sensitive information when importing a new repo. !8885 (Bernard Pietraga)
|
||||
- Fix pipeline graph vertical spacing in Firefox and Safari. !8886
|
||||
- Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory. !8891
|
||||
- Fix Ctrl+Click support for Todos and Merge Request page tabs. !8898
|
||||
- Fix wrong call to ProjectCacheWorker.perform. !8910
|
||||
- Don't perform Devise trackable updates on blocked User records. !8915
|
||||
- Add ability to export project inherited group members to Import/Export. !8923
|
||||
- replace `find_with_namespace` with `find_by_full_path`. !8949 (Adam Pahlevi)
|
||||
- Fixes flickering of avatar border in mention dropdown. !8950
|
||||
- Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index. !8956
|
||||
- Fix deleting projects with pipelines and builds. !8960
|
||||
- Fix broken anchor links when special characters are used. !8961 (Andrey Krivko)
|
||||
- Ensure autogenerated title does not cause failing spec. !8963 (brian m. carlson)
|
||||
- Update doc for enabling or disabling GitLab CI. !8965 (Takuya Noguchi)
|
||||
- Remove deprecated MR and Issue endpoints and preserve V3 namespace. !8967
|
||||
- Fixed "substract" typo on /help/user/project/slash_commands. !8976 (Jason Aquino)
|
||||
- Preserve backward compatibility CI/CD and disallow setting `coverage` regexp in global context. !8981
|
||||
- use babel to transpile all non-vendor javascript assets regardless of file extension. !8988
|
||||
- Fix MR widget url. !8989
|
||||
- Fixes hover cursor on pipeline pagenation. !9003
|
||||
- Layer award emoji dropdown over the right sidebar. !9004
|
||||
- Do not display deploy keys in user's own ssh keys list. !9024
|
||||
- upgrade babel 5.8.x to babel 6.22.x. !9072
|
||||
- upgrade to webpack v2.2. !9078
|
||||
- Trigger autocomplete after selecting a slash command. !9117
|
||||
- Add space between text and loading icon in Megre Request Widget. !9119
|
||||
- Fix job to pipeline renaming. !9147
|
||||
- Replace static fixture for merge_request_tabs_spec.js. !9172 (winniehell)
|
||||
- Replace static fixture for right_sidebar_spec.js. !9211 (winniehell)
|
||||
- Show merge errors in merge request widget. !9229
|
||||
- Increase process_commit queue weight from 2 to 3. !9326 (blackst0ne)
|
||||
- Don't require lib/gitlab/request_profiler/middleware.rb in config/initializers/request_profiler.rb.
|
||||
- Force new password after password reset via API. (George Andrinopoulos)
|
||||
- Allows to search within project by commit hash. (YarNayar)
|
||||
- Show organisation membership and delete comment on smaller viewports, plus change comment author name to username.
|
||||
- Remove turbolinks.
|
||||
- Convert pipeline action icons to svg to have them propperly positioned.
|
||||
- Remove rogue scrollbars for issue comments with inline elements.
|
||||
- Align Segoe UI label text.
|
||||
- Color + and - signs in diffs to increase code legibility.
|
||||
- Fix tab index order on branch commits list page. (Ryan Harris)
|
||||
- Add hover style to copy icon on commit page header. (Ryan Harris)
|
||||
- Remove hover animation from row elements.
|
||||
- Improve pipeline status icon linking in widgets.
|
||||
- Fix commit title bar and repository view copy clipboard button order on last commit in repository view.
|
||||
- Fix mini-pipeline stage tooltip text wrapping.
|
||||
- Updated builds info link on the project settings page. (Ryan Harris)
|
||||
- 27240 Make progress bars consistent.
|
||||
- Only render hr when user can't archive project.
|
||||
- 27352-search-label-filter-header.
|
||||
- Include :author, :project, and :target in Event.with_associations.
|
||||
- Don't instantiate AR objects in Event.in_projects.
|
||||
- Don't capitalize environment name in show page.
|
||||
- Update and pin the `jwt` gem to ~> 1.5.6.
|
||||
- Edited the column header for the environments list from created to updated and added created to environments detail page colum header titles.
|
||||
- Give ci status text on pipeline graph a better font-weight.
|
||||
- Add default labels to bulk assign dropdowns.
|
||||
- Only return target project's comments for a commit.
|
||||
- Fixes Pipelines table is not showing branch name for commit.
|
||||
- Fix regression where cmd-click stopped working for todos and merge request tabs.
|
||||
- Fix stray pipelines API request when showing MR.
|
||||
- Fix Merge request pipelines displays JSON.
|
||||
- Fix current build arrow indicator.
|
||||
- Fix contribution activity alignment.
|
||||
- Show Pipeline(not Job) in MR desktop notification.
|
||||
- Fix tooltips in mini pipeline graph.
|
||||
- Display loading indicator when filtering ref switcher dropdown.
|
||||
- Show pipeline graph in MR widget if there are any stages.
|
||||
- Fix icon colors in merge request widget mini graph.
|
||||
- Improve blockquote formatting in notification emails.
|
||||
- Adds container to tooltip in order to make it work with overflow:hidden in parent element.
|
||||
- Restore pagination to admin abuse reports.
|
||||
- Ensure export files are removed after a namespace is deleted.
|
||||
- Add `y` keyboard shortcut to move to file permalink.
|
||||
- Adds /target_branch slash command functionality for merge requests. (YarNayar)
|
||||
- Patch Asciidocs rendering to block XSS.
|
||||
- contribution calendar scrolls from right to left.
|
||||
- Copying a rendered issue/comment will paste into GFM textareas as actual GFM.
|
||||
- Don't delete assigned MRs/issues when user is deleted.
|
||||
- Remove new branch button for confidential issues.
|
||||
- Don't allow project guests to subscribe to merge requests through the API. (Robert Schilling)
|
||||
- Don't connect in Gitlab::Database.adapter_name.
|
||||
- Prevent users from creating notes on resources they can't access.
|
||||
- Ignore encrypted attributes in Import/Export.
|
||||
- Change rspec test to guarantee window is resized before visiting page.
|
||||
- Prevent users from deleting system deploy keys via the project deploy key API.
|
||||
- Fix XSS vulnerability in SVG attachments.
|
||||
- Make MR-review-discussions more reliable.
|
||||
- fix incorrect sidekiq concurrency count in admin background page. (wendy0402)
|
||||
- Make notification_service spec DRYer by making test reusable. (YarNayar)
|
||||
- Redirect http://someproject.git to http://someproject. (blackst0ne)
|
||||
- Fixed group label links in issue/merge request sidebar.
|
||||
- Improve gl.utils.handleLocationHash tests.
|
||||
- Fixed Issuable sidebar not closing on smaller/mobile sized screens.
|
||||
- Resets assignee dropdown when sidebar is open.
|
||||
- Disallow system notes for closed issuables.
|
||||
- Fix timezone on issue boards due date.
|
||||
- Remove unused js response from refs controller.
|
||||
- Prevent the GitHub importer from assigning labels and comments to merge requests or issues belonging to other projects.
|
||||
- Fixed merge requests tab extra margin when fixed to window.
|
||||
- Patch XSS vulnerability in RDOC support.
|
||||
- Refresh authorizations when transferring projects.
|
||||
- Remove issue and MR counts from labels index.
|
||||
- Don't use backup Active Record connections for Sidekiq.
|
||||
- Add index to ci_trigger_requests for commit_id.
|
||||
- Add indices to improve loading of labels page.
|
||||
- Reduced query count for snippet search.
|
||||
- Update GitLab Pages to v0.3.1.
|
||||
- Upgrade omniauth gem to 1.3.2.
|
||||
- Remove deprecated GitlabCiService.
|
||||
- Requeue pending deletion projects.
|
||||
|
||||
## 8.16.6 (2017-02-17)
|
||||
|
||||
- API: Fix file downloading. !0 (8267)
|
||||
- Reduce hits to LDAP on Git HTTP auth by reordering auth mechanisms. !8752
|
||||
- Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory. !8891
|
||||
- Fix wrong call to ProjectCacheWorker.perform. !8910
|
||||
- Remove unnecessary queries for .atom and .json in Dashboard::ProjectsController#index. !8956
|
||||
- Fix broken anchor links when special characters are used. !8961 (Andrey Krivko)
|
||||
- Do not display deploy keys in user's own ssh keys list. !9024
|
||||
- Show merge errors in merge request widget. !9229
|
||||
- Don't delete assigned MRs/issues when user is deleted.
|
||||
- backport of EE fix !954.
|
||||
- Refresh authorizations when transferring projects.
|
||||
- Don't use backup Active Record connections for Sidekiq.
|
||||
- Check public snippets for spam.
|
||||
|
||||
## 8.16.5 (2017-02-14)
|
||||
|
||||
- Patch Asciidocs rendering to block XSS.
|
||||
|
|
@ -181,6 +377,10 @@ entry.
|
|||
- Add margin to markdown math blocks.
|
||||
- Add hover state to MR comment reply button.
|
||||
|
||||
## 8.15.7 (2017-02-15)
|
||||
|
||||
- No changes.
|
||||
|
||||
## 8.15.6 (2017-02-14)
|
||||
|
||||
- Patch Asciidocs rendering to block XSS.
|
||||
|
|
@ -451,6 +651,10 @@ entry.
|
|||
- Whitelist next project names: help, ci, admin, search. !8227
|
||||
- Adds back CSS for progress-bars. !8237
|
||||
|
||||
## 8.14.10 (2017-02-15)
|
||||
|
||||
- No changes.
|
||||
|
||||
## 8.14.9 (2017-02-14)
|
||||
|
||||
- Patch Asciidocs rendering to block XSS.
|
||||
|
|
|
|||
|
|
@ -93,18 +93,20 @@ Please see the [UX Guide for GitLab].
|
|||
|
||||
### Retrospective
|
||||
|
||||
After each release (usually on the 22nd of each month), we have a retrospective
|
||||
call where we discuss what went well, what went wrong, and what we can improve
|
||||
for the next release. The [retrospective notes] are public and you are invited
|
||||
to comment them.
|
||||
If you're interested, you can even join the [retrospective call][retro-kickoff-call].
|
||||
After each release, we have a retrospective call where we discuss what went well,
|
||||
what went wrong, and what we can improve for the next release. The
|
||||
[retrospective notes] are public and you are invited to comment on them.
|
||||
If you're interested, you can even join the
|
||||
[retrospective call][retro-kickoff-call], on the first working day after the
|
||||
22nd at 6pm CET / 9am PST.
|
||||
|
||||
### Kickoff
|
||||
|
||||
Before working on the next release (usually on the 8th of each month), we have a
|
||||
Before working on the next release, we have a
|
||||
kickoff call to explain what we expect to ship in the next release. The
|
||||
[kickoff notes] are public and you are invited to comment them.
|
||||
If you're interested, you can even join the [kickoff call][retro-kickoff-call].
|
||||
[kickoff notes] are public and you are invited to comment on them.
|
||||
If you're interested, you can even join the [kickoff call][retro-kickoff-call],
|
||||
on the first working day after the 7th at 6pm CET / 9am PST..
|
||||
|
||||
[retrospective notes]: https://docs.google.com/document/d/1nEkM_7Dj4bT21GJy0Ut3By76FZqCfLBmFQNVThmW2TY/edit?usp=sharing
|
||||
[kickoff notes]: https://docs.google.com/document/d/1ElPkZ90A8ey_iOkTvUs_ByMlwKK6NAB2VOK5835wYK0/edit?usp=sharing
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
0.3.0
|
||||
0.3.1
|
||||
|
|
|
|||
6
Gemfile
6
Gemfile
|
|
@ -1,6 +1,6 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '4.2.7.1'
|
||||
gem 'rails', '4.2.8'
|
||||
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
||||
|
||||
# Responders respond_to and respond_with
|
||||
|
|
@ -34,7 +34,7 @@ gem 'omniauth-saml', '~> 1.7.0'
|
|||
gem 'omniauth-shibboleth', '~> 1.2.0'
|
||||
gem 'omniauth-twitter', '~> 1.2.0'
|
||||
gem 'omniauth_crowd', '~> 2.2.0'
|
||||
gem 'omniauth-authentiq', '~> 0.2.0'
|
||||
gem 'omniauth-authentiq', '~> 0.3.0'
|
||||
gem 'rack-oauth2', '~> 1.2.1'
|
||||
gem 'jwt', '~> 1.5.6'
|
||||
|
||||
|
|
@ -333,7 +333,7 @@ gem 'newrelic_rpm', '~> 3.16'
|
|||
|
||||
gem 'octokit', '~> 4.6.2'
|
||||
|
||||
gem 'mail_room', '~> 0.9.0'
|
||||
gem 'mail_room', '~> 0.9.1'
|
||||
|
||||
gem 'email_reply_trimmer', '~> 0.1'
|
||||
gem 'html2text'
|
||||
|
|
|
|||
95
Gemfile.lock
95
Gemfile.lock
|
|
@ -3,40 +3,39 @@ GEM
|
|||
specs:
|
||||
RedCloth (4.3.2)
|
||||
ace-rails-ap (4.1.0)
|
||||
actionmailer (4.2.7.1)
|
||||
actionpack (= 4.2.7.1)
|
||||
actionview (= 4.2.7.1)
|
||||
activejob (= 4.2.7.1)
|
||||
actionmailer (4.2.8)
|
||||
actionpack (= 4.2.8)
|
||||
actionview (= 4.2.8)
|
||||
activejob (= 4.2.8)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.7.1)
|
||||
actionview (= 4.2.7.1)
|
||||
activesupport (= 4.2.7.1)
|
||||
actionpack (4.2.8)
|
||||
actionview (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (4.2.7.1)
|
||||
activesupport (= 4.2.7.1)
|
||||
actionview (4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
activejob (4.2.7.1)
|
||||
activesupport (= 4.2.7.1)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
activejob (4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.7.1)
|
||||
activesupport (= 4.2.7.1)
|
||||
activemodel (4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.7.1)
|
||||
activemodel (= 4.2.7.1)
|
||||
activesupport (= 4.2.7.1)
|
||||
activerecord (4.2.8)
|
||||
activemodel (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
arel (~> 6.0)
|
||||
activerecord_sane_schema_dumper (0.2)
|
||||
rails (>= 4, < 5)
|
||||
activesupport (4.2.7.1)
|
||||
activesupport (4.2.8)
|
||||
i18n (~> 0.7)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
|
|
@ -47,7 +46,7 @@ GEM
|
|||
activerecord (>= 3.0)
|
||||
akismet (2.0.0)
|
||||
allocations (1.0.5)
|
||||
arel (6.0.3)
|
||||
arel (6.0.4)
|
||||
asana (0.4.0)
|
||||
faraday (~> 0.9)
|
||||
faraday_middleware (~> 0.9)
|
||||
|
|
@ -86,7 +85,7 @@ GEM
|
|||
sass (>= 3.3.4)
|
||||
brakeman (3.4.1)
|
||||
browser (2.2.0)
|
||||
builder (3.2.2)
|
||||
builder (3.2.3)
|
||||
bullet (5.2.0)
|
||||
activesupport (>= 3.0.0)
|
||||
uniform_notifier (~> 1.10.0)
|
||||
|
|
@ -127,7 +126,7 @@ GEM
|
|||
execjs
|
||||
coffee-script-source (1.10.0)
|
||||
colorize (0.7.7)
|
||||
concurrent-ruby (1.0.2)
|
||||
concurrent-ruby (1.0.4)
|
||||
connection_pool (2.2.1)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
|
|
@ -354,7 +353,7 @@ GEM
|
|||
json (~> 1.8)
|
||||
multi_xml (>= 0.5.2)
|
||||
httpclient (2.8.2)
|
||||
i18n (0.7.0)
|
||||
i18n (0.8.0)
|
||||
ice_nine (0.11.1)
|
||||
influxdb (0.2.3)
|
||||
cause
|
||||
|
|
@ -370,7 +369,7 @@ GEM
|
|||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.5)
|
||||
railties (>= 3.2.16)
|
||||
json (1.8.3)
|
||||
json (1.8.6)
|
||||
json-schema (2.6.2)
|
||||
addressable (~> 2.3.8)
|
||||
jwt (1.5.6)
|
||||
|
|
@ -409,7 +408,7 @@ GEM
|
|||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.4)
|
||||
mime-types (>= 1.16, < 4)
|
||||
mail_room (0.9.0)
|
||||
mail_room (0.9.1)
|
||||
memoist (0.15.0)
|
||||
method_source (0.8.2)
|
||||
mime-types (2.99.3)
|
||||
|
|
@ -429,9 +428,8 @@ GEM
|
|||
net-ssh (3.0.1)
|
||||
netrc (0.11.0)
|
||||
newrelic_rpm (3.16.0.318)
|
||||
nokogiri (1.6.8)
|
||||
nokogiri (1.6.8.1)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
pkg-config (~> 1.1.7)
|
||||
numerizer (0.1.1)
|
||||
oauth (0.5.1)
|
||||
oauth2 (1.2.0)
|
||||
|
|
@ -448,7 +446,7 @@ GEM
|
|||
rack (>= 1.0, < 3)
|
||||
omniauth-auth0 (1.4.1)
|
||||
omniauth-oauth2 (~> 1.1)
|
||||
omniauth-authentiq (0.2.2)
|
||||
omniauth-authentiq (0.3.0)
|
||||
omniauth-oauth2 (~> 1.3, >= 1.3.1)
|
||||
omniauth-azure-oauth2 (0.0.6)
|
||||
jwt (~> 1.0)
|
||||
|
|
@ -506,7 +504,6 @@ GEM
|
|||
parser (2.3.1.4)
|
||||
ast (~> 2.2)
|
||||
pg (0.18.4)
|
||||
pkg-config (1.1.7)
|
||||
poltergeist (1.9.0)
|
||||
capybara (~> 2.1)
|
||||
cliver (~> 0.3.1)
|
||||
|
|
@ -548,28 +545,28 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.7.1)
|
||||
actionmailer (= 4.2.7.1)
|
||||
actionpack (= 4.2.7.1)
|
||||
actionview (= 4.2.7.1)
|
||||
activejob (= 4.2.7.1)
|
||||
activemodel (= 4.2.7.1)
|
||||
activerecord (= 4.2.7.1)
|
||||
activesupport (= 4.2.7.1)
|
||||
rails (4.2.8)
|
||||
actionmailer (= 4.2.8)
|
||||
actionpack (= 4.2.8)
|
||||
actionview (= 4.2.8)
|
||||
activejob (= 4.2.8)
|
||||
activemodel (= 4.2.8)
|
||||
activerecord (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.7.1)
|
||||
railties (= 4.2.8)
|
||||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (1.0.7)
|
||||
rails-dom-testing (1.0.8)
|
||||
activesupport (>= 4.2.0.beta, < 5.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
nokogiri (~> 1.6)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.3)
|
||||
loofah (~> 2.0)
|
||||
railties (4.2.7.1)
|
||||
actionpack (= 4.2.7.1)
|
||||
activesupport (= 4.2.7.1)
|
||||
railties (4.2.8)
|
||||
actionpack (= 4.2.8)
|
||||
activesupport (= 4.2.8)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.1.0)
|
||||
|
|
@ -733,10 +730,10 @@ GEM
|
|||
spring (>= 0.9.1)
|
||||
spring-commands-spinach (1.1.0)
|
||||
spring (>= 0.9.1)
|
||||
sprockets (3.7.0)
|
||||
sprockets (3.7.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (3.1.1)
|
||||
sprockets-rails (3.2.0)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
|
|
@ -760,7 +757,7 @@ GEM
|
|||
daemons (~> 1.0, >= 1.0.9)
|
||||
eventmachine (~> 1.0, >= 1.0.4)
|
||||
rack (>= 1, < 3)
|
||||
thor (0.19.1)
|
||||
thor (0.19.4)
|
||||
thread_safe (0.3.5)
|
||||
tilt (2.0.5)
|
||||
timecop (0.8.1)
|
||||
|
|
@ -912,7 +909,7 @@ DEPENDENCIES
|
|||
license_finder (~> 2.1.0)
|
||||
licensee (~> 8.0.0)
|
||||
loofah (~> 2.0.3)
|
||||
mail_room (~> 0.9.0)
|
||||
mail_room (~> 0.9.1)
|
||||
method_source (~> 0.8)
|
||||
minitest (~> 5.7.0)
|
||||
mousetrap-rails (~> 1.4.6)
|
||||
|
|
@ -925,7 +922,7 @@ DEPENDENCIES
|
|||
oj (~> 2.17.4)
|
||||
omniauth (~> 1.3.2)
|
||||
omniauth-auth0 (~> 1.4.1)
|
||||
omniauth-authentiq (~> 0.2.0)
|
||||
omniauth-authentiq (~> 0.3.0)
|
||||
omniauth-azure-oauth2 (~> 0.0.6)
|
||||
omniauth-cas3 (~> 1.1.2)
|
||||
omniauth-facebook (~> 4.0.0)
|
||||
|
|
@ -949,7 +946,7 @@ DEPENDENCIES
|
|||
rack-cors (~> 0.4.0)
|
||||
rack-oauth2 (~> 1.2.1)
|
||||
rack-proxy (~> 0.6.0)
|
||||
rails (= 4.2.7.1)
|
||||
rails (= 4.2.8)
|
||||
rails-deprecated_sanitizer (~> 1.0.3)
|
||||
rainbow (~> 2.1.0)
|
||||
rblineprof (~> 0.3.6)
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ We're hiring developers, support people, and production engineers all the time,
|
|||
There are two editions of GitLab:
|
||||
|
||||
- GitLab Community Edition (CE) is available freely under the MIT Expat license.
|
||||
- GitLab Enterprise Edition (EE) includes [extra features](https://about.gitlab.com/features/#compare) that are more useful for organizations with more than 100 users. To use EE and get official support please [become a subscriber](https://about.gitlab.com/pricing/).
|
||||
- GitLab Enterprise Edition (EE) includes [extra features](https://about.gitlab.com/products/#compare-options) that are more useful for organizations with more than 100 users. To use EE and get official support please [become a subscriber](https://about.gitlab.com/products/).
|
||||
|
||||
## Website
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
|
|
@ -0,0 +1 @@
|
|||
<svg width="12" height="15" viewBox="0 0 12 15" xmlns="http://www.w3.org/2000/svg"><path d="M10.267 11.028V5.167c-.028-.728-.318-1.372-.878-1.923-.56-.55-1.194-.85-1.922-.877h-.934V.5l-2.8 2.8 2.8 2.8V4.233h.934a.976.976 0 0 1 .644.29.88.88 0 0 1 .289.644v5.861a1.86 1.86 0 0 0 .933 3.472 1.86 1.86 0 0 0 .934-3.472zM3.733 3.3a1.86 1.86 0 0 0-1.866-1.867 1.86 1.86 0 0 0-.934 3.472v6.123a1.86 1.86 0 0 0 .933 3.472 1.86 1.86 0 0 0 .934-3.472V4.905c.55-.317.933-.914.933-1.605z" fill-rule="nonzero"/></svg>
|
||||
|
After Width: | Height: | Size: 506 B |
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
|
|
@ -61,4 +61,4 @@
|
|||
|
||||
return Admin;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -147,4 +147,4 @@
|
|||
};
|
||||
|
||||
window.Api = Api;
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -101,11 +101,6 @@ require('es6-promise').polyfill();
|
|||
}
|
||||
});
|
||||
|
||||
$('.nav-sidebar').niceScroll({
|
||||
cursoropacitymax: '0.4',
|
||||
cursorcolor: '#FFF',
|
||||
cursorborder: '1px solid #FFF'
|
||||
});
|
||||
$('.js-select-on-focus').on('focusin', function () {
|
||||
return $(this).select().one('mouseup', function (e) {
|
||||
return e.preventDefault();
|
||||
|
|
@ -245,9 +240,7 @@ require('es6-promise').polyfill();
|
|||
});
|
||||
gl.awardsHandler = new AwardsHandler();
|
||||
new Aside();
|
||||
// bind sidebar events
|
||||
new gl.Sidebar();
|
||||
|
||||
gl.utils.initTimeagoTimeout();
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -22,4 +22,4 @@
|
|||
|
||||
return Aside;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -59,4 +59,4 @@
|
|||
|
||||
return Autosave;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -377,4 +377,4 @@ var emojiAliases = require('emoji-aliases');
|
|||
|
||||
return AwardsHandler;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -25,4 +25,4 @@ var autosize = require('vendor/autosize');
|
|||
autosize.update($fields);
|
||||
return $fields.css('resize', 'vertical');
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@
|
|||
return e.preventDefault();
|
||||
});
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -74,4 +74,4 @@ require('../extensions/jquery');
|
|||
return $this.tooltip('hide');
|
||||
});
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -59,4 +59,4 @@ require('../extensions/jquery');
|
|||
return hideOrShowHelpBlock($form);
|
||||
});
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -63,4 +63,4 @@
|
|||
|
||||
return BlobFileDropzone;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -20,4 +20,4 @@ require('./template_selector');
|
|||
|
||||
return BlobGitignoreSelector;
|
||||
})(gl.TemplateSelector);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@
|
|||
|
||||
return BlobGitignoreSelectors;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -25,4 +25,4 @@ require('./template_selector');
|
|||
|
||||
return BlobLicenseSelector;
|
||||
})(gl.TemplateSelector);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ require('./edit_blob');
|
|||
var blob = new EditBlob(url, $('.js-edit-blob-form').data('blob-language'));
|
||||
new NewCommitForm($('.js-edit-blob-form'));
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -85,4 +85,4 @@
|
|||
|
||||
return EditBlob;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -1,16 +1,20 @@
|
|||
/* eslint-disable one-var, quote-props, comma-dangle, space-before-function-paren, import/newline-after-import, no-multi-spaces, max-len */
|
||||
/* eslint-disable one-var, quote-props, comma-dangle, space-before-function-paren */
|
||||
/* global Vue */
|
||||
/* global BoardService */
|
||||
|
||||
function requireAll(context) { return context.keys().map(context); }
|
||||
|
||||
window.Vue = require('vue');
|
||||
window.Vue.use(require('vue-resource'));
|
||||
requireAll(require.context('./models', true, /^\.\/.*\.(js|es6)$/));
|
||||
requireAll(require.context('./stores', true, /^\.\/.*\.(js|es6)$/));
|
||||
requireAll(require.context('./services', true, /^\.\/.*\.(js|es6)$/));
|
||||
requireAll(require.context('./mixins', true, /^\.\/.*\.(js|es6)$/));
|
||||
requireAll(require.context('./filters', true, /^\.\/.*\.(js|es6)$/));
|
||||
require('./models/issue');
|
||||
require('./models/label');
|
||||
require('./models/list');
|
||||
require('./models/milestone');
|
||||
require('./models/user');
|
||||
require('./stores/boards_store');
|
||||
require('./stores/modal_store');
|
||||
require('./services/board_service');
|
||||
require('./mixins/modal_mixins');
|
||||
require('./mixins/sortable_default_options');
|
||||
require('./filters/due_date_filters');
|
||||
require('./components/board');
|
||||
require('./components/board_sidebar');
|
||||
require('./components/new_list_dropdown');
|
||||
|
|
@ -93,17 +97,53 @@ $(() => {
|
|||
modal: ModalStore.store,
|
||||
store: Store.state,
|
||||
},
|
||||
watch: {
|
||||
disabled() {
|
||||
this.updateTooltip();
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
disabled() {
|
||||
return Store.shouldAddBlankState();
|
||||
return !this.store.lists.filter(list => list.type !== 'blank' && list.type !== 'done').length;
|
||||
},
|
||||
tooltipTitle() {
|
||||
if (this.disabled) {
|
||||
return 'Please add a list to your board first';
|
||||
}
|
||||
|
||||
return '';
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
updateTooltip() {
|
||||
const $tooltip = $(this.$el);
|
||||
|
||||
this.$nextTick(() => {
|
||||
if (this.disabled) {
|
||||
$tooltip.tooltip();
|
||||
} else {
|
||||
$tooltip.tooltip('destroy');
|
||||
}
|
||||
});
|
||||
},
|
||||
openModal() {
|
||||
if (!this.disabled) {
|
||||
this.toggleModal(true);
|
||||
}
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.updateTooltip();
|
||||
},
|
||||
template: `
|
||||
<button
|
||||
class="btn btn-create pull-right prepend-left-10 has-tooltip"
|
||||
class="btn btn-create pull-right prepend-left-10"
|
||||
type="button"
|
||||
:disabled="disabled"
|
||||
@click="toggleModal(true)">
|
||||
data-placement="bottom"
|
||||
:class="{ 'disabled': disabled }"
|
||||
:title="tooltipTitle"
|
||||
:aria-disabled="disabled"
|
||||
@click="openModal">
|
||||
Add issues
|
||||
</button>
|
||||
`,
|
||||
|
|
|
|||
|
|
@ -69,4 +69,4 @@
|
|||
})(this));
|
||||
|
||||
window.Breakpoints = Breakpoints;
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -31,4 +31,4 @@
|
|||
}
|
||||
});
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -275,4 +275,4 @@
|
|||
|
||||
return Build;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@
|
|||
|
||||
return BuildArtifacts;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@
|
|||
|
||||
return Commit;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@
|
|||
|
||||
return CommitFile;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -173,4 +173,4 @@
|
|||
|
||||
return ImageFile;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -65,4 +65,4 @@
|
|||
|
||||
return CommitsList;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -88,4 +88,4 @@
|
|||
|
||||
return Compare;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -66,4 +66,4 @@
|
|||
|
||||
return CompareAutocomplete;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -28,4 +28,4 @@
|
|||
|
||||
return ConfirmDangerModal;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -46,4 +46,4 @@ window.Clipboard = require('vendor/clipboard');
|
|||
clipboard.on('success', genericSuccess);
|
||||
return clipboard.on('error', genericError);
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -107,9 +107,9 @@
|
|||
if (typeof label.message === 'string') {
|
||||
errors = label.message;
|
||||
} else {
|
||||
errors = label.message.map(function (value, key) {
|
||||
return key + " " + value[0];
|
||||
}).join("<br/>");
|
||||
errors = Object.keys(label.message).map(key =>
|
||||
`${gl.text.humanize(key)} ${label.message[key].join(', ')}`
|
||||
).join("<br/>");
|
||||
}
|
||||
|
||||
this.$newLabelError
|
||||
|
|
|
|||
|
|
@ -4,10 +4,20 @@
|
|||
|
||||
window.Vue = require('vue');
|
||||
window.Cookies = require('js-cookie');
|
||||
|
||||
function requireAll(context) { return context.keys().map(context); }
|
||||
requireAll(require.context('./svg', false, /^\.\/.*\.(js|es6)$/));
|
||||
requireAll(require.context('.', true, /^\.\/(?!cycle_analytics_bundle).*\.(js|es6)$/));
|
||||
require('./svg/icon_branch');
|
||||
require('./svg/icon_build_status');
|
||||
require('./svg/icon_commit');
|
||||
require('./components/stage_code_component');
|
||||
require('./components/stage_issue_component');
|
||||
require('./components/stage_plan_component');
|
||||
require('./components/stage_production_component');
|
||||
require('./components/stage_review_component');
|
||||
require('./components/stage_staging_component');
|
||||
require('./components/stage_test_component');
|
||||
require('./components/total_time_component');
|
||||
require('./cycle_analytics_service');
|
||||
require('./cycle_analytics_store');
|
||||
require('./default_event_objects');
|
||||
|
||||
$(() => {
|
||||
const OVERVIEW_DIALOG_COOKIE = 'cycle_analytics_help_dismissed';
|
||||
|
|
@ -97,7 +107,7 @@ $(() => {
|
|||
}
|
||||
|
||||
this.isLoadingStage = true;
|
||||
cycleAnalyticsStore.setStageEvents([]);
|
||||
cycleAnalyticsStore.setStageEvents([], stage);
|
||||
cycleAnalyticsStore.setActiveStage(stage);
|
||||
|
||||
cycleAnalyticsService
|
||||
|
|
@ -107,7 +117,7 @@ $(() => {
|
|||
})
|
||||
.done((response) => {
|
||||
this.isEmptyStage = !response.events.length;
|
||||
cycleAnalyticsStore.setStageEvents(response.events);
|
||||
cycleAnalyticsStore.setStageEvents(response.events, stage);
|
||||
})
|
||||
.error(() => {
|
||||
this.isEmptyStage = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,8 @@
|
|||
/* eslint-disable no-param-reassign */
|
||||
|
||||
require('../lib/utils/text_utility');
|
||||
const DEFAULT_EVENT_OBJECTS = require('./default_event_objects');
|
||||
|
||||
((global) => {
|
||||
global.cycleAnalytics = global.cycleAnalytics || {};
|
||||
|
||||
|
|
@ -34,11 +38,12 @@
|
|||
});
|
||||
|
||||
newData.stages.forEach((item) => {
|
||||
const stageName = item.title.toLowerCase();
|
||||
const stageSlug = gl.text.dasherize(item.title.toLowerCase());
|
||||
item.active = false;
|
||||
item.isUserAllowed = data.permissions[stageName];
|
||||
item.emptyStageText = EMPTY_STAGE_TEXTS[stageName];
|
||||
item.component = `stage-${stageName}-component`;
|
||||
item.isUserAllowed = data.permissions[stageSlug];
|
||||
item.emptyStageText = EMPTY_STAGE_TEXTS[stageSlug];
|
||||
item.component = `stage-${stageSlug}-component`;
|
||||
item.slug = stageSlug;
|
||||
});
|
||||
newData.analytics = data;
|
||||
return newData;
|
||||
|
|
@ -58,31 +63,33 @@
|
|||
this.deactivateAllStages();
|
||||
stage.active = true;
|
||||
},
|
||||
setStageEvents(events) {
|
||||
this.state.events = this.decorateEvents(events);
|
||||
setStageEvents(events, stage) {
|
||||
this.state.events = this.decorateEvents(events, stage);
|
||||
},
|
||||
decorateEvents(events) {
|
||||
decorateEvents(events, stage) {
|
||||
const newEvents = [];
|
||||
|
||||
events.forEach((item) => {
|
||||
if (!item) return;
|
||||
|
||||
item.totalTime = item.total_time;
|
||||
item.author.webUrl = item.author.web_url;
|
||||
item.author.avatarUrl = item.author.avatar_url;
|
||||
const eventItem = Object.assign({}, DEFAULT_EVENT_OBJECTS[stage.slug], item);
|
||||
|
||||
if (item.created_at) item.createdAt = item.created_at;
|
||||
if (item.short_sha) item.shortSha = item.short_sha;
|
||||
if (item.commit_url) item.commitUrl = item.commit_url;
|
||||
eventItem.totalTime = eventItem.total_time;
|
||||
eventItem.author.webUrl = eventItem.author.web_url;
|
||||
eventItem.author.avatarUrl = eventItem.author.avatar_url;
|
||||
|
||||
delete item.author.web_url;
|
||||
delete item.author.avatar_url;
|
||||
delete item.total_time;
|
||||
delete item.created_at;
|
||||
delete item.short_sha;
|
||||
delete item.commit_url;
|
||||
if (eventItem.created_at) eventItem.createdAt = eventItem.created_at;
|
||||
if (eventItem.short_sha) eventItem.shortSha = eventItem.short_sha;
|
||||
if (eventItem.commit_url) eventItem.commitUrl = eventItem.commit_url;
|
||||
|
||||
newEvents.push(item);
|
||||
delete eventItem.author.web_url;
|
||||
delete eventItem.author.avatar_url;
|
||||
delete eventItem.total_time;
|
||||
delete eventItem.created_at;
|
||||
delete eventItem.short_sha;
|
||||
delete eventItem.commit_url;
|
||||
|
||||
newEvents.push(eventItem);
|
||||
});
|
||||
|
||||
return newEvents;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,98 @@
|
|||
module.exports = {
|
||||
issue: {
|
||||
created_at: '',
|
||||
url: '',
|
||||
iid: '',
|
||||
title: '',
|
||||
total_time: {},
|
||||
author: {
|
||||
avatar_url: '',
|
||||
id: '',
|
||||
name: '',
|
||||
web_url: '',
|
||||
},
|
||||
},
|
||||
plan: {
|
||||
title: '',
|
||||
commit_url: '',
|
||||
short_sha: '',
|
||||
total_time: {},
|
||||
author: {
|
||||
name: '',
|
||||
id: '',
|
||||
avatar_url: '',
|
||||
web_url: '',
|
||||
},
|
||||
},
|
||||
code: {
|
||||
title: '',
|
||||
iid: '',
|
||||
created_at: '',
|
||||
url: '',
|
||||
total_time: {},
|
||||
author: {
|
||||
name: '',
|
||||
id: '',
|
||||
avatar_url: '',
|
||||
web_url: '',
|
||||
},
|
||||
},
|
||||
test: {
|
||||
name: '',
|
||||
id: '',
|
||||
date: '',
|
||||
url: '',
|
||||
short_sha: '',
|
||||
commit_url: '',
|
||||
total_time: {},
|
||||
branch: {
|
||||
name: '',
|
||||
url: '',
|
||||
},
|
||||
},
|
||||
review: {
|
||||
title: '',
|
||||
iid: '',
|
||||
created_at: '',
|
||||
url: '',
|
||||
state: '',
|
||||
total_time: {},
|
||||
author: {
|
||||
name: '',
|
||||
id: '',
|
||||
avatar_url: '',
|
||||
web_url: '',
|
||||
},
|
||||
},
|
||||
staging: {
|
||||
id: '',
|
||||
short_sha: '',
|
||||
date: '',
|
||||
url: '',
|
||||
commit_url: '',
|
||||
total_time: {},
|
||||
author: {
|
||||
name: '',
|
||||
id: '',
|
||||
avatar_url: '',
|
||||
web_url: '',
|
||||
},
|
||||
branch: {
|
||||
name: '',
|
||||
url: '',
|
||||
},
|
||||
},
|
||||
production: {
|
||||
title: '',
|
||||
created_at: '',
|
||||
url: '',
|
||||
iid: '',
|
||||
total_time: {},
|
||||
author: {
|
||||
name: '',
|
||||
id: '',
|
||||
avatar_url: '',
|
||||
web_url: '',
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
@ -1,14 +1,18 @@
|
|||
/* eslint-disable func-names, comma-dangle, new-cap, no-new, import/newline-after-import, no-multi-spaces, max-len */
|
||||
/* eslint-disable func-names, comma-dangle, new-cap, no-new, max-len */
|
||||
/* global Vue */
|
||||
/* global ResolveCount */
|
||||
|
||||
function requireAll(context) { return context.keys().map(context); }
|
||||
const Vue = require('vue');
|
||||
requireAll(require.context('./models', false, /^\.\/.*\.(js|es6)$/));
|
||||
requireAll(require.context('./stores', false, /^\.\/.*\.(js|es6)$/));
|
||||
requireAll(require.context('./services', false, /^\.\/.*\.(js|es6)$/));
|
||||
requireAll(require.context('./mixins', false, /^\.\/.*\.(js|es6)$/));
|
||||
requireAll(require.context('./components', false, /^\.\/.*\.(js|es6)$/));
|
||||
require('./models/discussion');
|
||||
require('./models/note');
|
||||
require('./stores/comments');
|
||||
require('./services/resolve');
|
||||
require('./mixins/discussion');
|
||||
require('./components/comment_resolve_btn');
|
||||
require('./components/jump_to_discussion');
|
||||
require('./components/resolve_btn');
|
||||
require('./components/resolve_count');
|
||||
require('./components/resolve_discussion_btn');
|
||||
|
||||
$(() => {
|
||||
const projectPath = document.querySelector('.merge-request').dataset.projectPath;
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
|
|||
case 'projects:merge_requests:index':
|
||||
case 'projects:issues:index':
|
||||
if (gl.FilteredSearchManager) {
|
||||
new gl.FilteredSearchManager();
|
||||
new gl.FilteredSearchManager(page === 'projects:issues:index' ? 'issues' : 'merge_requests');
|
||||
}
|
||||
Issuable.init();
|
||||
new gl.IssuableBulkActions({
|
||||
|
|
@ -118,6 +118,7 @@ const ShortcutsBlob = require('./shortcuts_blob');
|
|||
new gl.IssuableTemplateSelectors();
|
||||
break;
|
||||
case 'projects:merge_requests:new':
|
||||
case 'projects:merge_requests:new_diffs':
|
||||
case 'projects:merge_requests:edit':
|
||||
new gl.Diff();
|
||||
shortcut_handler = new ShortcutsNavigation();
|
||||
|
|
@ -382,4 +383,4 @@ const ShortcutsBlob = require('./shortcuts_blob');
|
|||
|
||||
return Dispatcher;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -126,13 +126,14 @@ require('./preview_markdown');
|
|||
};
|
||||
pasteText = function(text) {
|
||||
var afterSelection, beforeSelection, caretEnd, caretStart, textEnd;
|
||||
var formattedText = text + "\n\n";
|
||||
caretStart = $(child)[0].selectionStart;
|
||||
caretEnd = $(child)[0].selectionEnd;
|
||||
textEnd = $(child).val().length;
|
||||
beforeSelection = $(child).val().substring(0, caretStart);
|
||||
afterSelection = $(child).val().substring(caretEnd, textEnd);
|
||||
$(child).val(beforeSelection + text + afterSelection);
|
||||
child.get(0).setSelectionRange(caretStart + text.length, caretEnd + text.length);
|
||||
$(child).val(beforeSelection + formattedText + afterSelection);
|
||||
child.get(0).setSelectionRange(caretStart + formattedText.length, caretEnd + formattedText.length);
|
||||
return form_textarea.trigger("input");
|
||||
};
|
||||
getFilename = function(e) {
|
||||
|
|
@ -216,4 +217,4 @@ require('./preview_markdown');
|
|||
|
||||
return DropzoneInput;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
/* eslint-disable no-param-reassign, no-new */
|
||||
/* global Flash */
|
||||
|
||||
const Vue = require('vue');
|
||||
Vue.use(require('vue-resource'));
|
||||
const Vue = window.Vue = require('vue');
|
||||
window.Vue.use(require('vue-resource'));
|
||||
const EnvironmentsService = require('../services/environments_service');
|
||||
const EnvironmentTable = require('./environments_table');
|
||||
const EnvironmentsStore = require('../stores/environments_store');
|
||||
require('../../vue_shared/components/table_pagination');
|
||||
require('../../lib/utils/common_utils');
|
||||
require('../../vue_shared/vue_resource_interceptor');
|
||||
|
||||
module.exports = Vue.component('environment-component', {
|
||||
|
||||
|
|
|
|||
|
|
@ -15,29 +15,29 @@ module.exports = Vue.component('actions-component', {
|
|||
},
|
||||
|
||||
template: `
|
||||
<div class="inline">
|
||||
<div class="dropdown">
|
||||
<a class="dropdown-new btn btn-default" data-toggle="dropdown">
|
||||
<div class="btn-group" role="group">
|
||||
<button class="dropdown btn btn-default dropdown-new" data-toggle="dropdown">
|
||||
<span>
|
||||
<span class="js-dropdown-play-icon-container" v-html="playIconSvg"></span>
|
||||
<i class="fa fa-caret-down"></i>
|
||||
</a>
|
||||
</span>
|
||||
|
||||
<ul class="dropdown-menu dropdown-menu-align-right">
|
||||
<li v-for="action in actions">
|
||||
<a :href="action.play_path"
|
||||
data-method="post"
|
||||
rel="nofollow"
|
||||
class="js-manual-action-link">
|
||||
<ul class="dropdown-menu dropdown-menu-align-right">
|
||||
<li v-for="action in actions">
|
||||
<a :href="action.play_path"
|
||||
data-method="post"
|
||||
rel="nofollow"
|
||||
class="js-manual-action-link">
|
||||
|
||||
<span class="js-action-play-icon-container" v-html="playIconSvg"></span>
|
||||
<span class="js-action-play-icon-container" v-html="playIconSvg"></span>
|
||||
|
||||
<span>
|
||||
{{action.name}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<span>
|
||||
{{action.name}}
|
||||
</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</button>
|
||||
</div>
|
||||
`,
|
||||
});
|
||||
|
|
|
|||
|
|
@ -505,39 +505,26 @@ module.exports = Vue.component('environment-item', {
|
|||
|
||||
<td class="hidden-xs">
|
||||
<div v-if="!model.isFolder">
|
||||
<div v-if="hasManualActions && canCreateDeployment"
|
||||
class="inline js-manual-actions-container">
|
||||
<actions-component
|
||||
<div class="btn-group" role="group">
|
||||
<actions-component v-if="hasManualActions && canCreateDeployment"
|
||||
:play-icon-svg="playIconSvg"
|
||||
:actions="manualActions">
|
||||
</actions-component>
|
||||
</div>
|
||||
|
||||
<div v-if="externalURL && canReadEnvironment"
|
||||
class="inline js-external-url-container">
|
||||
<external-url-component
|
||||
<external-url-component v-if="externalURL && canReadEnvironment"
|
||||
:external-url="externalURL">
|
||||
</external-url-component>
|
||||
</div>
|
||||
|
||||
<div v-if="hasStopAction && canCreateDeployment"
|
||||
class="inline js-stop-component-container">
|
||||
<stop-component
|
||||
<stop-component v-if="hasStopAction && canCreateDeployment"
|
||||
:stop-url="model.stop_path">
|
||||
</stop-component>
|
||||
</div>
|
||||
|
||||
<div v-if="model && model.terminal_path"
|
||||
class="inline js-terminal-button-container">
|
||||
<terminal-button-component
|
||||
<terminal-button-component v-if="model && model.terminal_path"
|
||||
:terminal-icon-svg="terminalIconSvg"
|
||||
:terminal-path="model.terminal_path">
|
||||
</terminal-button-component>
|
||||
</div>
|
||||
|
||||
<div v-if="canRetry && canCreateDeployment"
|
||||
class="inline js-rollback-component-container">
|
||||
<rollback-component
|
||||
<rollback-component v-if="canRetry && canCreateDeployment"
|
||||
:is-last-deployment="isLastDeployment"
|
||||
:retry-url="retryUrl">
|
||||
</rollback-component>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
const EnvironmentsComponent = require('./components/environment');
|
||||
require('../vue_shared/vue_resource_interceptor');
|
||||
|
||||
$(() => {
|
||||
window.gl = window.gl || {};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
const EnvironmentsFolderComponent = require('./environments_folder_view');
|
||||
require('../../vue_shared/vue_resource_interceptor');
|
||||
|
||||
$(() => {
|
||||
window.gl = window.gl || {};
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
/* eslint-disable no-param-reassign, no-new */
|
||||
/* global Flash */
|
||||
|
||||
const Vue = require('vue');
|
||||
Vue.use(require('vue-resource'));
|
||||
const Vue = window.Vue = require('vue');
|
||||
window.Vue.use(require('vue-resource'));
|
||||
const EnvironmentsService = require('../services/environments_service');
|
||||
const EnvironmentTable = require('../components/environments_table');
|
||||
const EnvironmentsStore = require('../stores/environments_store');
|
||||
require('../../vue_shared/components/table_pagination');
|
||||
require('../../lib/utils/common_utils');
|
||||
require('../../vue_shared/vue_resource_interceptor');
|
||||
|
||||
module.exports = Vue.component('environment-folder-view', {
|
||||
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@
|
|||
return $(this).removeAttr('disabled').removeClass('disabled');
|
||||
}
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -144,4 +144,4 @@
|
|||
}
|
||||
});
|
||||
};
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -37,23 +37,18 @@ require('./filtered_search_dropdown');
|
|||
}
|
||||
|
||||
renderContent() {
|
||||
const dropdownData = [{
|
||||
icon: 'fa-pencil',
|
||||
hint: 'author:',
|
||||
tag: '<@author>',
|
||||
}, {
|
||||
icon: 'fa-user',
|
||||
hint: 'assignee:',
|
||||
tag: '<@assignee>',
|
||||
}, {
|
||||
icon: 'fa-clock-o',
|
||||
hint: 'milestone:',
|
||||
tag: '<%milestone>',
|
||||
}, {
|
||||
icon: 'fa-tag',
|
||||
hint: 'label:',
|
||||
tag: '<~label>',
|
||||
}];
|
||||
const dropdownData = [];
|
||||
|
||||
[].forEach.call(this.input.parentElement.querySelectorAll('.dropdown-menu'), (dropdownMenu) => {
|
||||
const { icon, hint, tag } = dropdownMenu.dataset;
|
||||
if (icon && hint && tag) {
|
||||
dropdownData.push({
|
||||
icon: `fa-${icon}`,
|
||||
hint,
|
||||
tag: `<${tag}>`,
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
this.droplab.changeHookList(this.hookId, this.dropdown, [droplabFilter], this.config);
|
||||
this.droplab.setData(this.hookId, dropdownData);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
function requireAll(context) { return context.keys().map(context); }
|
||||
|
||||
requireAll(require.context('./', true, /^\.\/(?!filtered_search_bundle).*\.(js|es6)$/));
|
||||
require('./dropdown_hint');
|
||||
require('./dropdown_non_user');
|
||||
require('./dropdown_user');
|
||||
require('./dropdown_utils');
|
||||
require('./filtered_search_dropdown_manager');
|
||||
require('./filtered_search_dropdown');
|
||||
require('./filtered_search_manager');
|
||||
require('./filtered_search_token_keys');
|
||||
require('./filtered_search_tokenizer');
|
||||
|
|
|
|||
|
|
@ -52,8 +52,9 @@
|
|||
}
|
||||
|
||||
renderContent(forceShowList = false) {
|
||||
if (forceShowList && this.getCurrentHook().list.hidden) {
|
||||
this.getCurrentHook().list.show();
|
||||
const currentHook = this.getCurrentHook();
|
||||
if (forceShowList && currentHook && currentHook.list.hidden) {
|
||||
currentHook.list.show();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -92,18 +93,24 @@
|
|||
}
|
||||
|
||||
hideDropdown() {
|
||||
this.getCurrentHook().list.hide();
|
||||
const currentHook = this.getCurrentHook();
|
||||
if (currentHook) {
|
||||
currentHook.list.hide();
|
||||
}
|
||||
}
|
||||
|
||||
resetFilters() {
|
||||
const hook = this.getCurrentHook();
|
||||
const data = hook.list.data;
|
||||
const results = data.map((o) => {
|
||||
const updated = o;
|
||||
updated.droplab_hidden = false;
|
||||
return updated;
|
||||
});
|
||||
hook.list.render(results);
|
||||
|
||||
if (hook) {
|
||||
const data = hook.list.data;
|
||||
const results = data.map((o) => {
|
||||
const updated = o;
|
||||
updated.droplab_hidden = false;
|
||||
return updated;
|
||||
});
|
||||
hook.list.render(results);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,10 +2,12 @@
|
|||
|
||||
(() => {
|
||||
class FilteredSearchDropdownManager {
|
||||
constructor(baseEndpoint = '') {
|
||||
constructor(baseEndpoint = '', page) {
|
||||
this.baseEndpoint = baseEndpoint.replace(/\/$/, '');
|
||||
this.tokenizer = gl.FilteredSearchTokenizer;
|
||||
this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
|
||||
this.filteredSearchInput = document.querySelector('.filtered-search');
|
||||
this.page = page;
|
||||
|
||||
this.setupMapping();
|
||||
|
||||
|
|
@ -150,7 +152,7 @@
|
|||
this.droplab = new DropLab();
|
||||
}
|
||||
|
||||
const match = gl.FilteredSearchTokenKeys.searchByKey(dropdownName.toLowerCase());
|
||||
const match = this.filteredSearchTokenKeys.searchByKey(dropdownName.toLowerCase());
|
||||
const shouldOpenFilterDropdown = match && this.currentDropdown !== match.key
|
||||
&& this.mapping[match.key];
|
||||
const shouldOpenHintDropdown = !match && this.currentDropdown !== 'hint';
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
(() => {
|
||||
class FilteredSearchManager {
|
||||
constructor() {
|
||||
constructor(page) {
|
||||
this.filteredSearchInput = document.querySelector('.filtered-search');
|
||||
this.clearSearchButton = document.querySelector('.clear-search');
|
||||
this.filteredSearchTokenKeys = gl.FilteredSearchTokenKeys;
|
||||
|
||||
if (this.filteredSearchInput) {
|
||||
this.tokenizer = gl.FilteredSearchTokenizer;
|
||||
this.dropdownManager = new gl.FilteredSearchDropdownManager(this.filteredSearchInput.getAttribute('data-base-endpoint') || '');
|
||||
this.dropdownManager = new gl.FilteredSearchDropdownManager(this.filteredSearchInput.getAttribute('data-base-endpoint') || '', page);
|
||||
|
||||
this.bindEvents();
|
||||
this.loadSearchParamsFromURL();
|
||||
|
|
@ -117,8 +118,8 @@
|
|||
const keyParam = decodeURIComponent(split[0]);
|
||||
const value = split[1];
|
||||
|
||||
// Check if it matches edge conditions listed in gl.FilteredSearchTokenKeys
|
||||
const condition = gl.FilteredSearchTokenKeys.searchByConditionUrl(p);
|
||||
// Check if it matches edge conditions listed in this.filteredSearchTokenKeys
|
||||
const condition = this.filteredSearchTokenKeys.searchByConditionUrl(p);
|
||||
|
||||
if (condition) {
|
||||
inputValues.push(`${condition.tokenKey}:${condition.value}`);
|
||||
|
|
@ -126,7 +127,7 @@
|
|||
// Sanitize value since URL converts spaces into +
|
||||
// Replace before decode so that we know what was originally + versus the encoded +
|
||||
const sanitizedValue = value ? decodeURIComponent(value.replace(/\+/g, ' ')) : value;
|
||||
const match = gl.FilteredSearchTokenKeys.searchByKeyParam(keyParam);
|
||||
const match = this.filteredSearchTokenKeys.searchByKeyParam(keyParam);
|
||||
|
||||
if (match) {
|
||||
const indexOf = keyParam.indexOf('_');
|
||||
|
|
@ -171,9 +172,9 @@
|
|||
paths.push(`state=${currentState}`);
|
||||
|
||||
tokens.forEach((token) => {
|
||||
const condition = gl.FilteredSearchTokenKeys
|
||||
const condition = this.filteredSearchTokenKeys
|
||||
.searchByConditionKeyValue(token.key, token.value.toLowerCase());
|
||||
const { param } = gl.FilteredSearchTokenKeys.searchByKey(token.key);
|
||||
const { param } = this.filteredSearchTokenKeys.searchByKey(token.key) || {};
|
||||
const keyParam = param ? `${token.key}_${param}` : token.key;
|
||||
let tokenPath = '';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
require('./filtered_search_token_keys');
|
||||
|
||||
(() => {
|
||||
class FilteredSearchTokenizer {
|
||||
static processTokens(input) {
|
||||
const allowedKeys = gl.FilteredSearchTokenKeys.get().map(i => i.key);
|
||||
// Regex extracts `(token):(symbol)(value)`
|
||||
// Values that start with a double quote must end in a double quote (same for single)
|
||||
const tokenRegex = /(\w+):([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\S+))/g;
|
||||
const tokenRegex = new RegExp(`(${allowedKeys.join('|')}):([~%@]?)(?:('[^']*'{0,1})|("[^"]*"{0,1})|(\\S+))`, 'g');
|
||||
const tokens = [];
|
||||
let lastToken = null;
|
||||
const searchToken = input.replace(tokenRegex, (match, key, symbol, v1, v2, v3) => {
|
||||
|
|
|
|||
|
|
@ -39,4 +39,4 @@
|
|||
|
||||
return Flash;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -83,12 +83,12 @@
|
|||
_a = decodeURI("%C3%80");
|
||||
_y = decodeURI("%C3%BF");
|
||||
|
||||
regexp = new RegExp("^(?:\\B|[^a-zA-Z0-9_" + atSymbolsWithoutBar + "]|\\s)" + flag + "(?![" + atSymbolsWithBar + "])(([A-Za-z" + _a + "-" + _y + "0-9_\'\.\+\-]|[^\\x00-\\x7a])*)$", 'gi');
|
||||
regexp = new RegExp("^(?:\\B|[^a-zA-Z0-9_" + atSymbolsWithoutBar + "]|\\s)" + flag + "(?!" + atSymbolsWithBar + ")((?:[A-Za-z" + _a + "-" + _y + "0-9_\'\.\+\-]|[^\\x00-\\x7a])*)$", 'gi');
|
||||
|
||||
match = regexp.exec(subtext);
|
||||
|
||||
if (match) {
|
||||
return (match[1] || match[1] === "") ? match[1] : match[2];
|
||||
return match[1];
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -103,6 +103,9 @@
|
|||
this.input.each((i, input) => {
|
||||
const $input = $(input);
|
||||
$input.off('focus.setupAtWho').on('focus.setupAtWho', this.setupAtWho.bind(this, $input));
|
||||
// This triggers at.js again
|
||||
// Needed for slash commands with suffixes (ex: /label ~)
|
||||
$input.on('inserted-commands.atwho', $input.trigger.bind($input, 'keyup'));
|
||||
});
|
||||
},
|
||||
setupAtWho: function($input) {
|
||||
|
|
@ -377,4 +380,4 @@
|
|||
(dataToInspect === loadingState || dataToInspect.name === loadingState);
|
||||
}
|
||||
};
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -47,9 +47,10 @@
|
|||
}
|
||||
// Only filter asynchronously only if option remote is set
|
||||
if (this.options.remote) {
|
||||
$inputContainer.parent().addClass('is-loading');
|
||||
clearTimeout(timeout);
|
||||
return timeout = setTimeout(function() {
|
||||
$inputContainer.parent().addClass('is-loading');
|
||||
|
||||
return this.options.query(this.input.val(), function(data) {
|
||||
$inputContainer.parent().removeClass('is-loading');
|
||||
return this.options.callback(data);
|
||||
|
|
@ -846,4 +847,4 @@
|
|||
}
|
||||
});
|
||||
};
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
// require everything else in this directory
|
||||
function requireAll(context) { return context.keys().map(context); }
|
||||
requireAll(require.context('.', false, /^\.\/(?!graphs_bundle).*\.(js|es6)$/));
|
||||
require('./stat_graph_contributors_graph');
|
||||
require('./stat_graph_contributors_util');
|
||||
require('./stat_graph_contributors');
|
||||
require('./stat_graph');
|
||||
|
|
|
|||
|
|
@ -15,4 +15,4 @@
|
|||
|
||||
return StatGraph;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -113,4 +113,4 @@ window.d3 = require('d3');
|
|||
|
||||
return ContributorsStatGraph;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -273,4 +273,4 @@ window.d3 = require('d3');
|
|||
|
||||
return ContributorsAuthorGraph;
|
||||
})(ContributorsGraph);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -135,4 +135,4 @@
|
|||
}
|
||||
}
|
||||
};
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -17,4 +17,4 @@
|
|||
|
||||
return GroupAvatar;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -68,4 +68,4 @@
|
|||
|
||||
return GroupsSelect;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
(function() {
|
||||
$(document).on('todo:toggle', function(e, count) {
|
||||
var $todoPendingCount = $('.todos-pending-count');
|
||||
$todoPendingCount.text(gl.text.addDelimiter(count));
|
||||
$todoPendingCount.text(gl.text.highCountTrim(count));
|
||||
$todoPendingCount.toggleClass('hidden', count === 0);
|
||||
});
|
||||
})();
|
||||
|
|
|
|||
|
|
@ -78,4 +78,4 @@
|
|||
new window.ImporterStatus(jobsImportPath, importPath);
|
||||
}
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -76,4 +76,4 @@
|
|||
|
||||
return IssuableContext;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -156,4 +156,4 @@
|
|||
|
||||
return IssuableForm;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
require('./flash');
|
||||
require('vendor/jquery.waitforimages');
|
||||
require('vendor/task_list');
|
||||
require('./task_list');
|
||||
|
||||
(function() {
|
||||
var bind = function(fn, me) { return function() { return fn.apply(me, arguments); }; };
|
||||
|
|
@ -11,10 +11,16 @@ require('vendor/task_list');
|
|||
this.Issue = (function() {
|
||||
function Issue() {
|
||||
this.submitNoteForm = bind(this.submitNoteForm, this);
|
||||
// Prevent duplicate event bindings
|
||||
this.disableTaskList();
|
||||
if ($('a.btn-close').length) {
|
||||
this.initTaskList();
|
||||
this.taskList = new gl.TaskList({
|
||||
dataType: 'issue',
|
||||
fieldName: 'description',
|
||||
selector: '.detail-page-description',
|
||||
onSuccess: (result) => {
|
||||
document.querySelector('#task_status').innerText = result.task_status;
|
||||
document.querySelector('#task_status_short').innerText = result.task_status_short;
|
||||
}
|
||||
});
|
||||
this.initIssueBtnEventListeners();
|
||||
}
|
||||
this.initMergeRequests();
|
||||
|
|
@ -22,11 +28,6 @@ require('vendor/task_list');
|
|||
this.initCanCreateBranch();
|
||||
}
|
||||
|
||||
Issue.prototype.initTaskList = function() {
|
||||
$('.detail-page-description .js-task-list-container').taskList('enable');
|
||||
return $(document).on('tasklist:changed', '.detail-page-description .js-task-list-container', this.updateTaskList);
|
||||
};
|
||||
|
||||
Issue.prototype.initIssueBtnEventListeners = function() {
|
||||
var _this, issueFailMessage;
|
||||
_this = this;
|
||||
|
|
@ -85,30 +86,6 @@ require('vendor/task_list');
|
|||
}
|
||||
};
|
||||
|
||||
Issue.prototype.disableTaskList = function() {
|
||||
$('.detail-page-description .js-task-list-container').taskList('disable');
|
||||
return $(document).off('tasklist:changed', '.detail-page-description .js-task-list-container');
|
||||
};
|
||||
|
||||
Issue.prototype.updateTaskList = function() {
|
||||
var patchData;
|
||||
patchData = {};
|
||||
patchData['issue'] = {
|
||||
'description': $('.js-task-list-field', this).val()
|
||||
};
|
||||
return $.ajax({
|
||||
type: 'PATCH',
|
||||
url: $('form.js-issuable-update').attr('action'),
|
||||
data: patchData,
|
||||
success: function(issue) {
|
||||
document.querySelector('#task_status').innerText = issue.task_status;
|
||||
document.querySelector('#task_status_short').innerText = issue.task_status_short;
|
||||
}
|
||||
});
|
||||
// TODO (rspeicher): Make the issue description inline-editable like a note so
|
||||
// that we can re-use its form here
|
||||
};
|
||||
|
||||
Issue.prototype.initMergeRequests = function() {
|
||||
var $container;
|
||||
$container = $('#merge-requests');
|
||||
|
|
@ -155,4 +132,4 @@ require('vendor/task_list');
|
|||
|
||||
return Issue;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -31,4 +31,4 @@
|
|||
|
||||
return IssueStatusSelect;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -43,4 +43,4 @@
|
|||
|
||||
return Labels;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -504,4 +504,4 @@
|
|||
|
||||
return LabelsSelect;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -44,4 +44,4 @@
|
|||
}
|
||||
});
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@
|
|||
|
||||
(function() {
|
||||
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@
|
|||
|
||||
(function() {
|
||||
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -46,4 +46,4 @@
|
|||
return dfd.promise();
|
||||
};
|
||||
})(window);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -297,4 +297,4 @@
|
|||
*/
|
||||
w.gl.utils.convertPermissionToBoolean = permission => permission === 'true';
|
||||
})(window);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -123,4 +123,4 @@ window.dateFormat = require('vendor/date.format');
|
|||
return Math.floor((date2 - date1) / millisecondsPerDay);
|
||||
};
|
||||
})(window);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -44,4 +44,4 @@
|
|||
w.notify = notifyMe;
|
||||
return w.notifyPermissions = notifyPermissions;
|
||||
})(window);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, quotes, one-var, one-var-declaration-per-line, operator-assignment, no-else-return, prefer-template, prefer-arrow-callback, no-empty, max-len, consistent-return, no-unused-vars, no-return-assign, max-len */
|
||||
|
||||
require('vendor/latinise');
|
||||
|
||||
(function() {
|
||||
(function(w) {
|
||||
var base;
|
||||
|
|
@ -12,6 +14,9 @@
|
|||
gl.text.addDelimiter = function(text) {
|
||||
return text ? text.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : text;
|
||||
};
|
||||
gl.text.highCountTrim = function(count) {
|
||||
return count > 99 ? '99+' : count;
|
||||
};
|
||||
gl.text.randomString = function() {
|
||||
return Math.random().toString(36).substring(7);
|
||||
};
|
||||
|
|
@ -164,8 +169,14 @@
|
|||
gl.text.pluralize = function(str, count) {
|
||||
return str + (count > 1 || count === 0 ? 's' : '');
|
||||
};
|
||||
return gl.text.truncate = function(string, maxLength) {
|
||||
gl.text.truncate = function(string, maxLength) {
|
||||
return string.substr(0, (maxLength - 3)) + '...';
|
||||
};
|
||||
gl.text.dasherize = function(str) {
|
||||
return str.replace(/[_\s]+/g, '-');
|
||||
};
|
||||
gl.text.slugify = function(str) {
|
||||
return str.trim().toLowerCase().latinise();
|
||||
};
|
||||
})(window);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@
|
|||
return (obj != null) && (obj.constructor === Object);
|
||||
};
|
||||
})(window);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -83,4 +83,4 @@
|
|||
document.location.href = url;
|
||||
};
|
||||
})(window);
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -179,4 +179,4 @@ require('vendor/jquery.scrollTo');
|
|||
|
||||
return LineHighlighter;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@
|
|||
window.addEventListener('beforeunload', function() {
|
||||
$('.tanuki-logo').addClass('animate');
|
||||
});
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -49,4 +49,4 @@
|
|||
|
||||
inputs.each(toggleClearInput);
|
||||
};
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
/* global MergeRequestTabs */
|
||||
|
||||
require('vendor/jquery.waitforimages');
|
||||
require('vendor/task_list');
|
||||
require('./task_list');
|
||||
require('./merge_request_tabs');
|
||||
|
||||
(function() {
|
||||
|
|
@ -24,12 +24,18 @@ require('./merge_request_tabs');
|
|||
};
|
||||
})(this));
|
||||
this.initTabs();
|
||||
// Prevent duplicate event bindings
|
||||
this.disableTaskList();
|
||||
this.initMRBtnListeners();
|
||||
this.initCommitMessageListeners();
|
||||
if ($("a.btn-close").length) {
|
||||
this.initTaskList();
|
||||
this.taskList = new gl.TaskList({
|
||||
dataType: 'merge_request',
|
||||
fieldName: 'description',
|
||||
selector: '.detail-page-description',
|
||||
onSuccess: (result) => {
|
||||
document.querySelector('#task_status').innerText = result.task_status;
|
||||
document.querySelector('#task_status_short').innerText = result.task_status_short;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -50,11 +56,6 @@ require('./merge_request_tabs');
|
|||
return this.$('.all-commits').removeClass('hide');
|
||||
};
|
||||
|
||||
MergeRequest.prototype.initTaskList = function() {
|
||||
$('.detail-page-description .js-task-list-container').taskList('enable');
|
||||
return $(document).on('tasklist:changed', '.detail-page-description .js-task-list-container', this.updateTaskList);
|
||||
};
|
||||
|
||||
MergeRequest.prototype.initMRBtnListeners = function() {
|
||||
var _this;
|
||||
_this = this;
|
||||
|
|
@ -85,30 +86,6 @@ require('./merge_request_tabs');
|
|||
}
|
||||
};
|
||||
|
||||
MergeRequest.prototype.disableTaskList = function() {
|
||||
$('.detail-page-description .js-task-list-container').taskList('disable');
|
||||
return $(document).off('tasklist:changed', '.detail-page-description .js-task-list-container');
|
||||
};
|
||||
|
||||
MergeRequest.prototype.updateTaskList = function() {
|
||||
var patchData;
|
||||
patchData = {};
|
||||
patchData['merge_request'] = {
|
||||
'description': $('.js-task-list-field', this).val()
|
||||
};
|
||||
return $.ajax({
|
||||
type: 'PATCH',
|
||||
url: $('form.js-issuable-update').attr('action'),
|
||||
data: patchData,
|
||||
success: function(mergeRequest) {
|
||||
document.querySelector('#task_status').innerText = mergeRequest.task_status;
|
||||
document.querySelector('#task_status_short').innerText = mergeRequest.task_status_short;
|
||||
}
|
||||
});
|
||||
// TODO (rspeicher): Make the merge request description inline-editable like a
|
||||
// note so that we can re-use its form here
|
||||
};
|
||||
|
||||
MergeRequest.prototype.initCommitMessageListeners = function() {
|
||||
$(document).on('click', 'a.js-with-description-link', function(e) {
|
||||
var textarea = $('textarea.js-commit-message');
|
||||
|
|
@ -131,4 +108,4 @@ require('./merge_request_tabs');
|
|||
|
||||
return MergeRequest;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -252,7 +252,6 @@ require('./smart_interval');
|
|||
$('.ci_widget.ci-error').show();
|
||||
this.setMergeButtonClass('btn-danger');
|
||||
}
|
||||
this.initMiniPipelineGraph();
|
||||
};
|
||||
|
||||
MergeRequestWidget.prototype.showCICoverage = function(coverage) {
|
||||
|
|
|
|||
|
|
@ -42,4 +42,4 @@
|
|||
|
||||
return MergedButtons;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
|
|
@ -172,4 +172,4 @@
|
|||
|
||||
return Milestone;
|
||||
})();
|
||||
}).call(this);
|
||||
}).call(window);
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue