root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
72,140 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

226 Commits

Author SHA1 Message Date
Clement Ho aa4942a213 Merge branch 'master' into 'bootstrap4' 
# Conflicts:
#   app/helpers/issuables_helper.rb
#   app/views/projects/_home_panel.html.haml
#   app/views/projects/commits/_commit.html.haml
 2018-04-09 17:04:05 +00:00
Phil Hughes 1cf54d8c92
Update GitLab SVGs version 2018-04-09 09:54:12 +01:00
Clement Ho e058a94935 Upgrade to Bootstrap 4 2018-04-06 12:17:04 -05:00
Stan Hu 87ef5e3222 Revert "Merge branch 'sh-add-fsevents-dev-dependency' into 'master'" 
This reverts merge request !17971
 2018-03-30 05:21:31 +00:00
Mike Greiling 7c626d2d0d Merge branch 'sh-add-fsevents-dev-dependency' into 'master' 
Add fsevents as an optional dependency to avoid Webpack killing the CPU

Closes #33886

See merge request gitlab-org/gitlab-ce!17971
 2018-03-27 12:43:50 +00:00
Lukas Eipert d023244aa5 Make use of the prettier ignore file during our save script 2018-03-26 07:39:14 +00:00
Stan Hu 398c298e75 Install fsevents as an optional dependency in package.json 2018-03-25 22:42:54 -07:00
Stan Hu 6b23620fc9 Revert "Add fsevents as a dev dependency to avoid Webpack killing the CPU" 
This reverts commit ec2aa70634.
 2018-03-25 22:42:07 -07:00
Stan Hu ec2aa70634 Add fsevents as a dev dependency to avoid Webpack killing the CPU 
Closes #33886
 2018-03-23 13:52:28 -07:00
Filipa Lacerda afa002c10d
Updates svg dependency 2018-03-19 09:16:35 +00:00
Tim Zallmann 51e454f3b1 Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation 2018-03-14 19:32:36 +00:00
Filipa Lacerda 4fa2d6daa7
Update dependency for svgs 2018-03-12 18:55:50 +00:00
Mike Greiling b6a59ccc8f Remove sync script for gitlab-svgs and reference the vendored library directly 2018-03-09 21:32:11 +00:00
Filipa Lacerda bb4d877db2
Updates svg dependency 2018-03-08 14:48:47 +00:00
Mike Greiling c3564cd79e Prevent webpack from rebooting while switching branches 2018-02-27 17:06:35 +00:00
Tim Zallmann 216d21c549 Merge branch 'upgrade-frontend-build-dependencies' into 'master' 
Upgrade frontend build dependencies

Closes #41400

See merge request gitlab-org/gitlab-ce!17246
 2018-02-21 07:42:59 +00:00
Jacob Schatz 35c8fd5586 Update to jQuery 3. 2018-02-20 22:20:48 +00:00
Mike Greiling 37de19b496
move babel-eslint to devDependencies 2018-02-20 16:05:16 -06:00
Mike Greiling 27e12f216d
update karma dependencies 2018-02-20 15:59:01 -06:00
Mike Greiling 7b4df031bb
upgrade several webpack loaders 2018-02-20 15:36:39 -06:00
Mike Greiling a36df404f3
update nodemon 2018-02-20 15:36:37 -06:00
Mike Greiling 44d426848e
upgrade various webpack plugins 2018-02-20 15:35:57 -06:00
Mike Greiling ee151d2ded
upgrade webpack and webpack-dev-server 2018-02-20 12:52:17 -06:00
Jacob Schatz 834f455b43 Chart.html.haml refactor 2018-02-19 20:43:10 +00:00
Jose Ivan Vargas 954bfb5db5 Addressed mr observations 2018-02-12 15:59:32 -06:00
Jose Ivan Vargas c833a09d91 Merge branch 'master' into jivl-update-katex 2018-02-12 12:48:31 -06:00
Phil Hughes f2ffb398d6
Update jquery.waitforimages & use npm version 
#39072
 2018-02-08 15:52:38 +00:00
Jose Ivan Vargas 46ae03628d Merge branch 'master' into jivl-update-katex 2018-02-05 15:16:41 -06:00
Eric Eastwood 2fb167fa3b Restore feature_highlight code 
From https://gitlab.com/gitlab-org/gitlab-ce/issues/36760

Was reverted in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14373
 2018-02-05 12:10:09 -06:00
Mike Greiling ed29be1b68
update nodemon watch configuration to restart dev-server when new entry points are added 2018-02-02 10:37:09 -06:00
Mike Greiling 900124810c
generate webpack entry points for pages directory automatically 2018-02-01 14:28:36 -06:00
Tim Zallmann 0e4de813fb Merge branch '42220-add-pending-empty-state' into 'master' 
Resolve "Add empty state for pending job"

Closes #42220

See merge request gitlab-org/gitlab-ce!16646
 2018-01-25 10:42:24 +00:00
Tim Zallmann 81bdb6ad8a Upgrade jasmine + raven to newer versions 2018-01-23 15:19:56 +00:00
Filipa Lacerda b983179545
Adds correct illustration for pending state 2018-01-23 11:42:49 +00:00
Tim Zallmann 4167f19b0a Upgraded all vue libraries 2018-01-23 09:37:07 +00:00
Filipa Lacerda deb9287fc2 Backport for Resolve "change status icon for reports when fails to be found or cannot load" 2018-01-23 08:44:46 +00:00
Tim Zallmann 931707ea89 Upgraded Karma Dependencies 2018-01-18 21:07:36 +00:00
Phil Hughes 54636e1d42 Merge branch 'fl-ipythin-10-3' into 'security-10-3' 
Port of [10.2] Sanitizes IPython notebook output

See merge request gitlab/gitlabhq!2285

(cherry picked from commit 1c46e031c70706450a8e0ae730f4c323b72f9e4c)

aac035fe Port of [10.2] Sanitizes IPython notebook output
 2018-01-16 17:05:01 -08:00
Takuya Noguchi 0abb379230 Update marked from 0.3.6 to 0.3.12 2018-01-16 08:24:23 +09:00
Phil Hughes 249b5015d7 Merge branch '34312-eslint-vue-plugin' into 'master' 
Resolve "Add eslint-vue-plugin to our stack"

Closes #34312

See merge request gitlab-org/gitlab-ce!16210
 2018-01-10 14:35:34 +00:00
Filipa Lacerda ee90edae27
Fix broken tests 2018-01-09 19:22:43 +00:00
Filipa Lacerda d222bcc932 Resolve "Install dev dependencies as devDependencies instead of dependencies" 2018-01-09 08:53:27 +00:00
Filipa Lacerda e2b759a2f4
Merge branch 'master' into 34312-eslint-vue-plugin 
* master: (140 commits)
  Add Gitter room link to I want to contribute since you always have questions
  Use workhorse 3.4.0
  chore: remove symbolic link
  Add memoization for properties
  Resolve "Allow QA tests to run with `CHROME_HEADLESS=false`"
  Resolve "Add graph value to hover"
  Fix slash commands dropdown description
  disables the shortcut to the issue boards when issues are disabled
  Fix static analysys
  Disable STI of ActiveRecord. Refactoring specs.
  Fix StaticSnalysys
  Fix change log
  Add changelog
  Revert bulk_insert and bring back AR insert(one by one)
  Add a new test for emptified params
  Use batch update for Service deactivation
  Fix query to look for proper unmanaged kubernetes service
  Fix static anylysy
  Use bulk_insert instead of AR create
  Opitmize migration process by using both unmanaged_kubernetes_service and kubernetes_service_without_template
  ...
 2018-01-08 19:19:52 +00:00
Filipa Lacerda 2a31a850c4
Merge branch 'master' into 34312-eslint-vue-plugin 
* master: (78 commits)
  Use --left-right and --max-count for counting diverging commits
  API: get participants from merge_requests & issues
  Copy Mermaid graphs as GFM
  Rephrase paragraph about e2e tests in merge requests in docs
  Remove EE only sections from docs
  Update redis-rack to 2.0.4
  Refactor matchers for background migrations
  Add id to modal.vue to support data-toggle="modal"
  Allow local tests to use a modified Gitaly
  Fix specs
  Use computed prop in expand button
  Update check.md
  add deprecation and removal issue to docs
  Add status attribute to runner api entity
  Fix typos in a code comment
  Refactor RelativePositioning so that it can be used by other classes
  Backport 'Rebase' feature from EE to CE
  Just try to detect and assign once
  Fix custom name in branch creation for issue in Firefox
  Modify `LDAP::Person` to return username value based on attributes
  ...
 2018-01-05 18:22:07 +00:00
Tim Zallmann 91477f6dae Resolve "Helpful and instructing Empty state for multi file editor" 2018-01-05 17:35:34 +00:00
Filipa Lacerda 318d6f449e
[ci skip] Fix more rules 2018-01-04 22:36:40 +00:00
Jacob Schatz e1f0d23c89 Moves prettier to dev dependency 2018-01-04 08:44:27 -05:00
Filipa Lacerda bb7e04a141
Move dependencies to dev dependencies 2018-01-04 09:22:10 +00:00
Filipa Lacerda b299198e1e
Adds `eslint-plugin-vue`, fixes linter errors and adds docs 2018-01-03 23:14:55 +00:00
Robert Speicher c8ddf067ed Merge branch 'pre-commit-prettier' into 'master' 
Pre commit prettier

See merge request gitlab-org/gitlab-ce!16061
 2018-01-03 19:52:26 +00:00