c74b7eb271
fix overlooked window binding in spec files
2017-02-17 17:02:14 -06:00
b7aaec05be
remove imports loader
2017-02-17 17:02:14 -06:00
0f31c5a92b
replace implicit this == window with explicit binding
2017-02-17 16:58:32 -06:00
71377c1aa0
Merge branch 'remove-issue-and-mr-counts-from-labels-page' into 'master'
...
Remove issue and MR counts from label index
Closes #25413
See merge request !9332
2017-02-17 21:31:59 +00:00
bb94c3bf74
Update CHANGELOG.md for 8.16.6
...
[ci skip]
2017-02-17 12:11:21 -08:00
edb1d063bc
Merge branch 'add-patch-release-changelogs' into 'master'
...
Add patch release changelogs
See merge request !9353
2017-02-17 19:58:07 +00:00
0b1e56c754
Merge remote-tracking branch 'dev/master' into add-patch-release-changelogs
2017-02-17 11:55:53 -08:00
f255269627
Merge branch 'add-yarn-documentation' into 'master'
...
Update documentation to include yarn in our dependencies
See merge request !9316
2017-02-17 19:46:23 +00:00
63cb6c843f
Merge branch 'fix-merge-service-with-no-source' into 'master'
...
Fix merge service error with no source
See merge request !9348
2017-02-17 19:37:36 +00:00
1fd90ef553
Merge branch 'rc/backport-ee-fix' into 'master'
...
Truncate the DB in after(:all) test for Gitlab::ImportExport::ProjectTreeRestorer
See merge request !9339
2017-02-17 19:20:40 +00:00
b43cb21dde
Merge branch '26379-iid-param' into 'master'
...
add a :iid param to the IssuableFinder
Closes #26379
See merge request !9222
2017-02-17 18:32:10 +00:00
7362fd6fdf
add a :iids param to IssuableFinder
2017-02-17 20:28:32 +02:00
668dfa0232
Merge branch 'fix-node-dev-deps' into 'master'
...
Move frontend dev dependencies out of production dependency list.
See merge request !9319
2017-02-17 18:21:44 +00:00
b612d01f98
Merge branch 'boards-sidebar-spec-refactor' into 'master'
...
Refactor boards sidebar spec
Closes #28310
See merge request !9330
2017-02-17 18:19:46 +00:00
a255abe83c
Merge branch 'fix-dependency-in-environments' into 'master'
...
Fix dependencies order in environments
Closes #28355
See merge request !9343
2017-02-17 18:06:34 +00:00
bce00bad77
Truncate the DB in after(:all) test for Gitlab::ImportExport::ProjectTreeRestorer
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-02-17 18:58:11 +01:00
40d26e2554
Fix merge service error with no source
...
This shouldn't be possible in CE, but is needed so that the code is the
same in CE and EE.
2017-02-17 17:48:32 +00:00
097924cf05
Merge branch 'gfm-autocomplete-fixes' into 'master'
...
Fix errors in GFM slash commands matcher
See merge request !8975
2017-02-17 17:18:54 +00:00
c77b68d627
correct gitlab version that started requiring yarn
2017-02-17 11:10:38 -06:00
5da4261865
pluralize "this step"
2017-02-17 11:07:41 -06:00
fd504fa883
use less strict caret ranges now that yarn.lock will take care of locking our dependencies in place
...
see: https://docs.npmjs.com/misc/semver
2017-02-17 11:04:12 -06:00
f75ad8a5e9
move webpack-dev-server and karma-mocha-reporter to devDependencies
2017-02-17 11:03:35 -06:00
74f211f076
Merge branch '28339-npm-jqueryui-ssh' into 'master'
...
Use http to fetch jQuery-ui dependency instead of ssh
Closes #28339
See merge request !9331
2017-02-17 17:01:05 +00:00
c59750de6f
Fix depenendencies loading Vue in EE
2017-02-17 16:52:48 +00:00
7627af225e
Merge branch 'zero-for-unlimited' into 'master'
...
changed minor inconsistency in help text
See merge request !9333
2017-02-17 16:32:34 +00:00
d2d632544c
Merge branch 'patch-14' into 'master'
...
Update gitlab_flow.md. Insert missing word on line 70.
See merge request !9334
2017-02-17 16:32:12 +00:00
7dd7ffc17b
Merge branch 'dynamic-project-title-fixture' into 'master'
...
Replace static fixture for project_title_spec.js
See merge request !9175
2017-02-17 16:11:27 +00:00
953c2547a2
Merge branch 'document-ce-to-ee' into 'master'
...
Document better the CE -> EE merge
See merge request !9313
2017-02-17 15:39:34 +00:00
62d72434f0
update yarn resolution for jquery-ui
2017-02-17 09:37:46 -06:00
761c0c86d1
Merge branch 'fix/gb/pipeline-retry-builds-started' into 'master'
...
Make pipeline retry take stages order into account
Closes #27431 , #23710 , and #26551
See merge request !9021
2017-02-17 15:19:41 +00:00
996ea3e524
Merge branch 'task_list_refactor' into 'master'
...
move task_list setup and events to own class
See merge request !9016
2017-02-17 15:12:48 +00:00
40ab56045b
Merge branch '28236-browse-button-dropping' into 'master'
...
Increase right side of file header to accommodate browse files button
Closes #28236
See merge request !9321
2017-02-17 14:55:38 +00:00
8094bcaa42
Reduced sidebar wait timeout
2017-02-17 14:51:00 +00:00
de6266d650
Merge branch '27920-both-wip-messages-showing' into 'master'
...
Dispatch needed JS when creating a new MR in diff view
Closes #27920
See merge request !9238
2017-02-17 14:48:00 +00:00
02443d1d41
Merge branch '28303-change-development-tanuki-favicon-colors-to-match-logo' into 'master'
...
Change development tanuki favicon colors to match logo color order
Closes #28303
See merge request !9329
2017-02-17 14:10:47 +00:00
15a05628b6
Merge branch 'move-spinach-dashboard-issues-test-to-rspec' into 'master'
...
Move dashboard issues spinach test to Rspec
See merge request !8955
2017-02-17 14:08:17 +00:00
c52afd166d
Merge branch 'issue_26714' into 'master'
...
Fix 'reset-email' link spec
Closes #26714
See merge request !9317
2017-02-17 14:06:09 +00:00
0159de4a4b
Merge branch '27605-research-proposal-template' into 'master'
...
27605-research-proposal-template
Closes #27605
See merge request !9047
2017-02-17 14:05:37 +00:00
10ad2f7735
Merge branch 'paginate-all-the-things' into 'master'
...
Paginate all the things
Closes #8099
See merge request !8606
2017-02-17 13:54:46 +00:00
b9cc02a68e
Remove support for locking in pipeline retry service
2017-02-17 14:36:43 +01:00
5f271a9fa2
Merge branch 'master' into fix/gb/pipeline-retry-builds-started
...
* master: (313 commits)
Allow slashes in slash command arguments
Add API endpoint to get all milestone merge requests
remove trailing comma
Restore pagination to admin abuse reports
replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin
only compress assets in production
Reduce number of pipelines created to test pagination
add CHANGELOG.md entry for !8761
prevent diff unfolding link from appearing for deleted files
fix build failures
only show diff unfolding link if there are more lines to show
fix typo in node section
Only yield valid references in ReferenceFilter.references_in
Cache js selectors; fix css
move "Install node modules" step before "Migrate DB" within update process
Renders pagination again for pipelines table
update migration docs for 8.17 to include minimum node version
Add CHANGELOG file
Fix positioning of top scroll button
Remove comments in migration
...
2017-02-17 14:31:00 +01:00
827a56a479
Merge branch 'fix/gb/remove-gitlab-ci-module' into 'master'
...
Remove legacy GitlabCi module from initializers
See merge request !9279
2017-02-17 13:29:02 +00:00
f98c2cf17f
Update gitlab_flow.md
2017-02-17 13:13:59 +00:00
c5c46f2e3d
changed minor inconsistency in help text
2017-02-17 14:08:07 +01:00
5213ef2387
Merge branch 'fix/gb/pipeline-retry-cancel-buttons-consistency' into 'master'
...
Fix pipeline retry and cancel buttons on pipeline details page
See merge request !9225
2017-02-17 13:05:00 +00:00
29d5a7ab75
Merge branch '26500-informative-slack-notifications' into 'master'
...
Adding links to user & build stage in a Build message
Closes #26500
See merge request !8641
2017-02-17 13:04:01 +00:00
f662bc5a86
Merge branch 'use-update-runner-service' into 'master'
...
Prefer service object over after_save hook
Closes #26921
See merge request !8664
2017-02-17 13:03:12 +00:00
5cc9ebbe14
Merge branch '22018-api-milestone-merge-requests' into 'master'
...
Add API endpoint to get all milestone merge requests
Closes #22018
See merge request !9298
2017-02-17 12:48:29 +00:00
bf93a9f50c
Remove issue and MR counts from labels index
...
We were performing two (quite slow, because of the need to do access
checks) queries for each label on the page: one to get the count of
issues with that label, and one to get the count of merge requests with
that label.
Until we have a performant way of doing this, remove the counts.
2017-02-17 12:44:10 +00:00
5b009528b6
Update lock file
2017-02-17 12:12:41 +00:00
Mike Greiling
Stan Hu
DJ Mountney
DJ Mountney
Clement Ho
Rémy Coutable
Robert Speicher
mhasbini
Alfredo Sumaran
Sean McGivern
Filipa Lacerda
Annabel Dunstone Gray
Kamil Trzciński
Fatih Acet
Phil Hughes
Grzegorz Bizon
Mark Bowman
dimitrieh