Commit 6e763b28 authored by Rémy Coutable's avatar Rémy Coutable

Resolve conflicts

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 061bba7e
......@@ -4,10 +4,6 @@ entry.
## 9.0.0 (2017-03-22)
<<<<<<< HEAD
- Remove the newrelic gem. !1335 (Robert Schilling)
=======
>>>>>>> ce/master
- Fix inconsistent naming for services that delete things. !5803 (dixpac)
- UI: Allow a project variable to be set to an empty value. !6044 (Lukáš Nový)
- Align task list checkboxes. !6487 (Jared Deckard <jared.deckard@gmail.com>)
......@@ -113,13 +109,8 @@ entry.
- API: Use `visibility` as string parameter everywhere. !9337
- Add the Username to the HTTP(S) clone URL of a Repository. !9347 (Jan Christophersen)
- Add spec for todo with target_type Commit. !9351 (George Andrinopoulos)
<<<<<<< HEAD
- Fixes includes line number during unfold copy n paste in parallel diff view. !9365
- API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`. !9365 (Robert Schilling)
=======
- API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`. !9365 (Robert Schilling)
- Fixes includes line number during unfold copy n paste in parallel diff view. !9365
>>>>>>> ce/master
- API: Use POST to (un)block a user. !9371 (Robert Schilling)
- Remove markup that was showing in tooltip for renamed files. !9374
- Drop unused ci_projects table and some unused project_id columns, then rename gl_project_id to project_id. Stop exporting job trace when exporting projects. !9378 (David Wagner)
......@@ -156,10 +147,7 @@ entry.
- Fix updaing commit status when using optional attributes. !9618
- Add filter and sorting to dashboard groups page. !9619
- Remove deprecated build status badge and related services. !9620
<<<<<<< HEAD
=======
- Remove the newrelic gem. !9622 (Robert Schilling)
>>>>>>> ce/master
- Rename table ci_commits to ci_pipelines. !9638
- Remove various unused CI tables and columns. !9639
- Use webpack CommonsChunkPlugin to place common javascript libraries in their own bundles. !9647
......@@ -192,36 +180,6 @@ entry.
- Allow creating merge request even if target branch is not specified in query params. !9968
- Removed d3 from the main application.js bundle. !10062
- Return 404 in project issues API endpoint when project cannot be found. !10093
<<<<<<< HEAD
- Add frequently used emojis back to awards menu.
- Add filtered search to MR page.
- Re-add the New Project button in nav bar.
- Show members of parent groups on project members page.
- Set Auto-Submitted header to mails. (Semyon Pupkov)
- Return 202 with JSON body on async removals on V4 API.
- Stop setting Strict-Transport-Securty header from within the app.
- Use "branch_name" instead "branch" on V3 branch creation API.
- Adds paginationd and folders view to environments table.
- Fix archive prefix bug for refs containing dots.
- ensure MR widget dropdown is same color as button.
- hide loading spinners for server-rendered sidebar fields.
- Decrease tanuki logo size.
- Add filter param for project membership for current_user in API v4.
- Add limit to the number of events showed in cycle analytics.
- Remove help link from right dropdown.
- Fix jobs table header height.
- Update account view to display new username.
- Narrow environment payload by using basic project details resource.
- Make a default namespace of Kubernetes service to contain project ID.
- Fix issues mentioned but not closed for external issue trackers.
- fix milestone does not automatically assign when create issue from milestone.
- Present GitLab version for each V3 to V4 API change on v3_to_v4.md.
- Format timeago date to short format.
- Fix errors in slash commands matcher, add simple test coverage. (YarNayar)
- Re-add Assign to me link to Merge Request and Issues.
- Added option to update to owner for group members.
- Add badges to global dropdown.
=======
- Fix positioning of `Scroll to top` button.
- Add limit to the number of events showed in cycle analytics.
- Only run timeago loops after rendering timeago components.
......@@ -235,7 +193,6 @@ entry.
- Make Git history follow renames again by performing the --skip in Ruby.
- Added option to update to owner for group members.
- Pick up option from GDK to disable webpack dev server livereload.
>>>>>>> ce/master
- Introduce Pipeline Triggers that are user-aware.
- Fixed loading spinner position on issue template toggle.
- Removed duplicate "Visibility Level" label on New Project page. (Robert Marcano)
......@@ -244,42 +201,6 @@ entry.
- Fix issuable stale object error handler for js when updating tasklists.
- Gather issuable metadata to avoid n+1 queries on index view.
- Remove JIRA closed status icon.
<<<<<<< HEAD
- Changed coverage reg expression placeholder text to be more like a placeholder.
- Make Git history follow renames again by performing the --skip in Ruby.
- Fixed long file names overflowing under action buttons.
- Fix grammer issue in admin/runners.
- Add Mock CI service/integration for development.
- Move tag services to Tags namespace. (dixpac)
- Removes label when moving issue to another list that it is currently in.
- Improved diff comment button UX.
- Allow slashes in slash command arguments.
- Only create unmergeable todos once when MR fails to merge.
- Only yield valid references in ReferenceFilter.references_in.
- Adds API endpoint to fetch all merge request for a single milestone. (Joren De Groof)
- Add member: Always return 409 when a member exists.
- Change development tanuki favicon colors to match logo color order.
- API issues - support filtering by iids.
- Rename priority sorting option to label priority.
- Added headers to protected branch access dropdowns.
- Remove plus icon from MR button on compare view.
- removed unused parameter 'status_only: true'.
- Fix positioning of `Scroll to top` button.
- Hide issue info when project issues are disabled. (George Andrinopoulos)
- Replaced jQuery UI datepicker.
- Removed jQuery UI highlight & autocomplete.
- Replaced jQuery UI sortable.
- Only run timeago loops after rendering timeago components.
- Remove readme-only project view preference.
- Remove tooltips from label subscription buttons.
- Increase right side of file header to button stays on same line.
- Centers loading icon vertically and horizontally in pipelines table in commit view.
- Rename retry failed button on pipeline page to just retry.
- Align bulk update issues button to the right.
- Remove remnants of git annex support.
- Pick up option from GDK to disable webpack dev server livereload.
- Fix z index issues with sidebar.
=======
- Fix z index issues with sidebar.
- Fixed long file names overflowing under action buttons.
- Only show public emails in atom feeds.
......@@ -308,15 +229,10 @@ entry.
- Align bulk update issues button to the right.
- Remove remnants of git annex support.
- Dispatch needed JS when creating a new MR in diff view.
>>>>>>> ce/master
- Change project count limit from 10 to 100000.
- Remove repeated routes.path check for postgresql database. (mhasbini)
- Fixed RSS button alignment on activity pages.
- Seed abuse reports for development.
<<<<<<< HEAD
- Only show public emails in atom feeds.
=======
>>>>>>> ce/master
- Bump Hashie to 3.5.5 and omniauth to 1.4.2 to eliminate warning noise.
- Add user deletion permission check in `Users::DestroyService`.
- Fix snippets search result spacing.
......@@ -325,29 +241,6 @@ entry.
- To protect against Server-side Request Forgery project import URLs are now prohibited against localhost or the server IP except for the assigned instance URL and port. Imports are also prohibited from ports below 1024 with the exception of ports 22, 80, and 443.
- Remove fixed positioning from top nav.
- Deduplicate markdown task lists.
<<<<<<< HEAD
- Default to subtle MR mege button until CI status is available.
- Update code editor (ACE) to 1.2.6, to fix input problems with compose key.
- update issue count when closing/reopening an issue.
- Use redis channel to post notifications.
- Removed top border from user contribution calendar.
- Added user callouts to the projects dashboard and user profile.
- Left align logo.
- Dispatch needed JS when creating a new MR in diff view.
- Specify in the documentation that only projects owners can transfer projects.
- Improves a11y in sidebar by adding aria-hidden attributes in i tags and by fixing two broken aria-hidden attributes.
- Clear ActiveRecord connections before starting Sidekiq.
- Combined deploy keys, push rules, protect branches and mirror repository settings options into a single one called Repository.
- Use native unicode emojis.
- Add storage class configuration option for Amazon S3 remote backups. (Jon Keys)
- Creating a new branch from an issue will automatically initialize a repository if one doesn't already exist.
- Dashboard project search keeps selected sort & filters.
- Add all available statuses to scope filter for project builds endpoint. (George Andrinopoulos)
- Visually show expanded diff lines cant have comments.
- Use full group name in GFM group reference title.
- Adds Pending and Finished tabs to pipelines page.
- don't animate logo when downloading files.
=======
- update issue count when closing/reopening an issue.
- Update code editor (ACE) to 1.2.6, to fix input problems with compose key.
- Improves a11y in sidebar by adding aria-hidden attributes in i tags and by fixing two broken aria-hidden attributes.
......@@ -391,7 +284,6 @@ entry.
- hide loading spinners for server-rendered sidebar fields.
- Change development tanuki favicon colors to match logo color order.
- API issues - support filtering by iids.
>>>>>>> ce/master
## 8.17.4 (2017-03-19)
......
......@@ -4,11 +4,6 @@
import Vue from 'vue';
<<<<<<< HEAD
=======
import Vue from 'vue';
>>>>>>> ce/master
require('./models/discussion');
require('./models/note');
require('./stores/comments');
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment