add upload and replace features

Created by: liyakun

Added update guide for updating to 7.5, and pointed installation and updates guides to new version.

Version 7.5.0

Add missing timestamps to the 'members' table

Version 7.5.1

Disable Sidekiq arguments logging by default

Conflicts: config/initializers/4_sidekiq.rb

Properly fix wiki restore.

ProjectWiki.new() creates a new wiki git repository, so any tries to bare clone a bundle fail. With this patch we remove the newly created wiki.git before restoring from the backup bundle.

Conflicts: lib/backup/repository.rb

Remove unnecessary backported change

Make the diff with 7.5.1 smaller.

Add wiki restore fix to CHANGELOG

Version 7.5.2

Update Sidekiq to 2.17.8

Conflicts: CHANGELOG

Bump gitlab_git with new rugged

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Revert "Update Sidekiq to 2.17.8"

This reverts commit 91ee82c5.

Update CHANGELOG for 7.5.3

Version 7.5.3

Create _commit_message_replace_container.haml.html

add commit-message container for "replace" functionality

Update new_tree_controller.rb

add "upload" and "replace" functionality

Create upload_service.rb

add "replace" commit-message container

Update file_action.rb

change file encoding, so user can upload and replace base64 file

Create _update.html.haml

add "replace" view

Update show.html.haml

show "replace"

Update _actions.html.haml

add "replace" action

Create _upload.html.haml

add "upload" view

Update _tree.html.haml

add "upload" button

Update show.html.haml

show "upload"

Update CHANGELOG

add "replace" and "upload" functionalities.

Rename _commit_message_replace_container.haml.html to _commit_message_replace_container.html.haml

Update _update.html.haml

Update _update.html.haml

Update browse_files.rb

add test for "replace" and "upload"

Update browse_files.feature

add test for "replace" and "upload"

Update browse_files.feature

Update _update.html.haml

Update _upload.html.haml

Update browse_files.rb

Rename _update.html.haml to _replace.html.haml

Update _replace.html.haml

Update _actions.html.haml

Update show.html.haml

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update and rename features to features/uploadfile.txt

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update file_action.rb

code style correction

Update browse_files.rb

code style correction

Update new_tree_controller.rb

code style correction

Update new_tree_controller.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

Update upload_service.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

code style correction

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Version 7.5.3

Create _commit_message_replace_container.haml.html

add commit-message container for "replace" functionality

Create upload_service.rb

add "replace" commit-message container

Create _update.html.haml

add "replace" view

Update _tree.html.haml

add "upload" button

Update show.html.haml

show "upload"

Update CHANGELOG

add "replace" and "upload" functionalities.

Rename _commit_message_replace_container.haml.html to _commit_message_replace_container.html.haml

Update _update.html.haml

Update _update.html.haml

Update browse_files.rb

add test for "replace" and "upload"

Update browse_files.feature

add test for "replace" and "upload"

Update browse_files.feature

Update _update.html.haml

Update _upload.html.haml

Update browse_files.rb

Rename _update.html.haml to _replace.html.haml

Update _replace.html.haml

Update _actions.html.haml

Update show.html.haml

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update and rename features to features/uploadfile.txt

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update browse_files.feature

Update browse_files.feature

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

Update browse_files.rb

Update file_action.rb

code style correction

Update browse_files.rb

code style correction

Update new_tree_controller.rb

code style correction

Update new_tree_controller.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

code style correction

Update upload_service.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

code style correction

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.rb

Update browse_files.feature

print validation errors when import fails

Fix dev user seed: multiple ID was used twice.

Use blob local instead of instance.

Disable / hide MR edit blob button if cannot edit.

Prepare ForkService to support forking projects to given namespaces

Remove overload of BaseService.initialize, so initialize gains params, which is used to pass the namespace (like e.g. in TransferService).

The namespace is checked for permission to create projects in it.

Remove unused Project#code function.

Add tests for tree edit routes

Critical because of possible confusion between /:id/preview and /:id for a path that ends in preview.

Disallow POST to compare: does not create objects

Add Markdown preview to more forms

Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.

Use GET instead of POST for Markdown previews

Refactor Markdown preview tests

Create a new shared module for common issue/merge request behavior, use expect syntax instead of should, and avoid visible: false in the have_css matcher.

Fix Markdown preview tests

Update Spinach tests for Markdown previews for the new-ish tab UI that replaced the old preview/edit toggle button.

Add new Markdown preview test

Add a test to make sure that Markdown previews are available when editing an existing issue.

Fix long line in view

Fix houndci warnings

Fix more Markdown preview tests

Fix test assertions

Make sure we're asserting the correct thing when testing visible and invisible DOM elements.

Remove unused has_gitlab_shell3? method

Refactor project fork service

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Select namespace where to fork project

Now you can fork project into group or personal namespace. Also I moved fork logic from ProjectsController to own fork resource

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Typo in project API events comment

fix backup rake task

Improve fork to namespaces feature

• Show namespace thumbnail differently if project was already forked
• Show loading spinner when click on fork
• Fork link navigates to personal namespace only if no manageable groups exists

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

remove extra cd command

Remove commit indicator from path on Commits tab

gitlab shell works if multiple rubies installed

Before this it would fail because git hooks automatically prepend things to the path, which can lead the wrong Ruby version to be called in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server on port 3001 under test_env.rb.

Better message for failed pushes because of git hooks

Conflicts: lib/gitlab/git_access.rb spec/lib/gitlab/git_access_spec.rb

revert using the extension of the blob to determine the syntax highlighting language

nohighlight functionality for a hardcoded set of filenames is kept

Small improvement to /api/user/keys doc

The keys resource includes a create_at attribute

Revert "gitlab shell works if multiple rubies installed"

This reverts commit 533f4cdf.

Use new gitlab-shell v2.3.0

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Hide gpg signature on tags page from tag message

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

bump gitlab_shell

Increase md typography font size

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Improve dashboard page for mobile

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix header and project home ui for mobile

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

HipChat service: correct service name & use v2 API

HipChat refers to their own product camel cased so we should do the same. HipChat no longer recommends people use the deprecated v1 API so switch to using the v2 API by default. hipchat-rb does not yet default to v2 in any version so it must be specified.

HipChat service: support custom servers

HipChat allows users to run their own private servers and to be able to support those we must connect to the correct URL when using one of these custom servers.

add rebuilding of authorized_keys to docs

add correct path to rebuild-keys doc

you have to update gitlab shell for gitlab 7.5

add missing password prompt to mysqldump

Possibility to create Milestones or Labels when Issues are disabled

Fixed an alignment issue, fixes #778

The blog post will trigger a mail to the list

Add missing timestamps to the 'members' table

remove extra upgrade details, add missing config

Update 7.5 update guide:

• Remove unnecessary upgrade details (they were completed in 7.4 upgrade and only needed one time)
• Add missing Nginx config details

update order of upgrade guide

GitLab needs to be stopped when backup is took.

add preliminary 7.6 upgrade guide

Add preliminary 7.6 upgrade guide. Makes it easier to add upgrades as changes are made rather than trying to round up everything at RC1.

Initial additions:

• Nginx changes needed again in 7.6 as they did not make the final 7.5 upgrade guide
• Suggest that user sets time zone (added in https://github.com/gitlabhq/gitlabhq/pull/8015 but missed in final 7.5 upgrade guide)

Replaces https://github.com/gitlabhq/gitlabhq/pull/8124

add details on backing up your SSH host keys

Users need to backup SSH host keys if they want to do a complete restore to the same domain and not have users get the WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! message.

start gitlab after mysql tweaks

More explicit wording of the documentation.

The release manager handles all releases

Establish ownership of security releases

Formatting and sequence of contrubution paragraphs.

Definition of done added to the docs.

Explicitly mention patch releases

Git hook messages: wiki access fix

Fix spelling mistake, thanks Ewoud.

Update time zone rake task for production. Resolves #8387 (closed)

Selecting a branch is dangerous now that we have rc in a branch.

Change it earlier as well.

added office analogy to help understanding of gitlab architecture

replaced hotlink

add details on protected branches

Add some details from https://about.gitlab.com/2014/11/26/keeping-your-code-protected/:

Who can:

• Force push to non-protected branches
• Force push to protected branches
• Remove protected branches

remove unnecessarry image

Add Dockerfile to build an Omnibus GitLab image

Make docker image file user agnostic, to prevent confusion over official images.

Make the docker commands so that people can build their own images.

Sort .gitignore.

Make clear that the upgrader script does not update gitlab-shell.

Dont allow project creation without repository

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Separate web page for projects without repository

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Move projects import to separate resource. Add bare repo creation to repository controller

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Improve project factories

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Change gitlab to gitlab_image on data run and add tail, thanks Vincent Robert.

Remove unused password argument from notification

We were still passing a 'password' argument around, but it is not used anywhere because we send a password reset link in the welcome email nowadays.

Fix deploy keys permission check in internal api

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix internal API for missing project or key

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Show username in comment header for easier mention

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Change twitter handle from gitlabhq -> gitlab

Disable Sidekiq arguments logging by default

UI improvements mostly for mobile screens

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Smaller tabs for mobile view

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Revert "Remove the lowest memory requirement of 512MB."

This reverts commit 5cf6d594.

System with 512MB of RAM can be used but swap size must be increased.

Update libv8 from 3.16.14.3 to 3.16.14.7

This selfish change fixes 'bundle install' on my (OS X) development machine.

Add troubleshooting section to the docker documentation.

Improve MR code reloading when push code

Every time you pushed to master it updates merge requests that has master as target branch. So if you have 50 open merge requests point to master it will reload all of them every time you push a single commit to master. The funny thing is that after reloading diff of most merge requests looks the same.

After this patch we update diff only if we push commit to master that includes in MR commits list.

For example we have next repository:

feature: A - B - C master: A

We create merge requests #1 (closed) with code from feature to master.

MR #1 (closed): B - C

If we push to master commit D - MR will not be reloaded. So picture will look next:

feature: A - B - C master: A - D MR #1 (closed): B - C

And if we push to master commit B - MR will be reloaded. So picture will look next:

feature: A - B - C master: A - B MR #1 (closed): C

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Remove vim since it is of no use to running GitLab.

Change vim command.

Add interactive commands.

Reload mr code on force push too

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Postgres log location is a directory.

Move build to first step and add interactive commands.

Add command to limit Postgres memory allocation, thanks Jacob.

Fix safari 8 ui issue

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Respect current controller scope when using search from project area

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

New label/milestone link from issue form opens in new window

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Render cross reference in issue title

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Add cross-project reference tooltip for merge request

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Update gemnasium-gitlab-service to version 0.2.3

Move commands to the readme, rename gitlab to gitlab_app, add PostgreSQL tweaks to gitlab.rb.

Add password hint.

Remove docker file maintainer at his request. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/245#note_647506

Use clickable checkboxes in issue template

The second gitlab.com deploy should be easy

Release CI at the same time as CE and EE

Show issue/mr id in the list below title

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix EE RC1 tag name

Add changes suggested by Sytse

Reword the 512 memmory advise.

Move to 7.5.2

gitlab-ctl can now be followed with docker logs

Reword configuration to recommend an interactive command line

Add some comments about updating the Omnibus package download location for the docker image.

Create helper for sort drowdown option names

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Set proper filter words

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Multi-provider auth. LDAP is not reworked

Supporting for multiple omniauth provider for the same user

added helper

Fix spelling error in dockerfile, thanks Vincent for noting it.

Handle web hook exception

Write to log if web hook cant be executed. This prevents 500 error when test web hook with invalid URL and prevent exceptions and retries in sidekiq

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

fix specs

Add rake task for google schema whitelisting.

Fix typo in the README.md for docker

The container name has been previously renamed to "gitlab_app".

Fix notifications for developers that don't read the documentation.

Seed is not seed dump.

Remove warning from db seed since it is called by db setup.

Update release docs to deploy to GitLab.com before publishing.

Update favorites to the new link.

Add locked_at to merge request

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Set/unset merge request locked_at timestamp after transition

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Automatically close merge requests that were locker for 1 day

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Revert "Merge pull request #7349 from srna/patch-1"

This reverts commit b37b71d8, reversing changes made to 42a1d808.

Move issues/mr filter to partial

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Add an avatar_url spec when relative url is set.

Add author filter for issues & merge requests pages

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

More tests for issues finder

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Prevent 500 on MR page if merge_event missing

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Decline push if repository does not exist

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Bolder event title and lighter color for event body

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Move sidekiq debug docs to development folder

Execute project services asynchronously

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Drop vagrant preference in issue tracker guidelines.

Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable

advise about unicorn workers

speed up migration to identities

memory constrained unicorn workers

Consolidate unicorn worker advise.

Example callback URL was incorrect (referencing /users/auth/github/callback, not /users/auth/twitter/callback)

Add security tips about file and paths

Add a failing route spec for file named diff.

Do not check for format on blob diff path.

Markdown dropzone image icon should not be clickable.

Use shell invocation according to the shell commands guidelines.

Add commit dates to repository-push email tempalte

The 'shell commands' guide also covers files/paths

Use system where only return result is needed.

Don't forget to splat.

Add strict validation to snippet file names

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Sanitize snippet file name in raw headers

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix snippet factory

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Implement sidebar navigation for project area

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Style app logo for sidenav

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Added process for green tests

Signed-off-by: Jeroen van Baarsen jeroenvanbaarsen@gmail.com

Fixed a lot of already defined notices

Signed-off-by: Jeroen van Baarsen jeroenvanbaarsen@gmail.com

Add missing webhook doc for tag event

Added Code of Conduct

Signed-off-by: Jeroen van Baarsen jeroenvanbaarsen@gmail.com

ruby 2.1.5 in .ruby-version

Require the ruby racer only in production since installing it on dev machines can cause a lot of problems. Hat tip to Jeroen van Baarsen

Rephrase of the text

Signed-off-by: Jeroen van Baarsen jeroenvanbaarsen@gmail.com

add kerberos dependency

Add documentation for the Sidekiq MemoryKiller

Remove unfinished file with the wrong name

transfer error handler

Add link to 'operations' README

Fix random Argument error when update note

In some strange cases Ruby thinks system is not AR field but Kernel.system call and raises exception during save. It should prevent this random wierd behaviour

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Update rack-attack to 4.2.0

If we are going to monkey-patch something it might as well be the latest version.

Fix graph and settings highlight

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Mobile UI fixes for sidebar nav

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Add icons to project sidenav

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Add theme type css class

add kerberos to Gemfile

Update the Omnibus package in Dockerfile

From 7.5.2 to 7.5.3.

Signed-off-by: kfei kfei@kfei.net

Reduce the size of Docker image

1. Add --no-install-recommends option to apt-get install, this avoids lots of (~30MB) unnecessary packages.
2. Add ca-certificates package for wget fetching stuffs from Amazon S3.
3. There is no need to run apt-get clean for an image derived from official Ubuntu since they already cleaned (see also: http://goo.gl/B2SQRB) all the garbages produced by apt-get.

Signed-off-by: kfei kfei@kfei.net

Move development information to the GitLab Development Kit.

Include default credentials in the readme and make all headers the same.

Improve sidenav colors

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Added update guide for updating to 7.6

Fixed version reference

Fix Rake tasks doc README: add top level h1

and link to missing to features.md.

Added link to the configuration sample for OmniAuth providers when using Omnibus.

Restyle issue/mr/milestone to new layout

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

[BUGFIX] Invalid branch in comparison

Differentiate system notes

Use a different name of the method to check if sanitize is enabled in check task.

Set project path & name in one field without transforamtion

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Set group path during creation

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Set group name from path in admin controller

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Allow Group path to be changed at the same time as name

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix spinach test

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

For API compatibility still generate path from name if only name provided

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix tests

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Remove extra css class markdown-area which prevented attachments upload.

Fix test

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Render MR diff full size of screen

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Clear responsibility to mention the team.

Shorter tweet so there is space for a hashtag.

Add libkrb5-dev dependency.

Warn people about not exposing at a time they can still do something about it.

Show issuable context labels as blocks

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix migration issue for mysql with index not being removed

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

One developer tip.

Remove index only if exists

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Note that it is default on Ubuntu.

Prevent 500 after merge MR if you check remove source branch

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Release manager should doublecheck the everyone has been mentioned in the blog post.

Corrected validation of 'Create branch' and 'Create tag' buttons

One column issue/mr lists for project

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Refactor issues and merge requests lists

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Updated the monthly release steps

Refactor issuable list pages

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Improvements to issues/mr filters:

• use filter_params variable when set filter values
• fix project issues spinach tests

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Note what has to be updated for new packages.

Fix scroll problems and disable authorized_only filter

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix diff comments

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix spinach tests

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

convert erb to haml

Fix layout if broadcast message enabled

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Stability improvement

Implemented notes (body) patching in API.

Small UI imporovement for merge request accept widget and projects page

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Align sidebar navigation differently

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Add migration for developers can push to protected branches flag.

Add checkbox for protected branch developer can push to.

Allow regular code push for developers if the protected branch allows it.

Move protected branch actions into a method.

Add option to disable/enable developers push to already protected branches.

Add spec for developers can push to protected branches.

Put nprogress spinner to bottom left position

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Make nprogress color to red

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Updated sidebar style to span the whole height.

Move protected branches list to a partial.

Update branch status with ajax call.

Update on the correct checkbox.

Move styling to css.

add EE features list and useful links to readme file in gitlab

Merge request error display.

Fixes #8432 (closed)

Improve UI for group milestone and project milestone pages

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

chmod -x

remove 'vendor/plugins' dir

Dont check for milestone description on group milestone page

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

doc workflow markdown style

• add h1 to README
• move h1 in workflow.md to h2 since the top image acts as h1
• typos

Remove or prepend _ to unused method arguments

Simplify SSH fingerprint regexp extraction

[\d\h] is the same as \h

Remove unneeded password_confirmation from seed.

Replace regex methods by string ones since faster

and more readable.

ruby 2.2.0 in .ruby-verison

Use shorter search for protected branch status.

Add documentation about protected branches.

permission.md align table, rm double empty line

Remove unused ex local variable from event.rb

New feature: add 'Mention' notification level

It does disable all emails expect system one or when you was @mentioned

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Rescue Net::OpenTimeout exception in web hook

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Markdown preview in wiki

Updated projects api to allow ordering

Added support for order_by and sort parameters, to sort the projects by the specified values. Updated projects api documentation including the order_by and sort parameters

Changed setting the sort variable

Changed from using cases to set the sort variable, to use a one line if/else statement

Updated indentation on case when statements.

Fix async services execution broken in 7.6

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix sidekiq for development

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Add user key actions to admins.

Reuse show page for user keys.

Use same font size for all sidenav items

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Inline protected branches list

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Add feature spec for user ssh keys on admin page.

Update gems for ruby 2.2.0

Updated create merge request submit view

Create merge request submit view now uses the same form layout as creating an issue. The commits view now uses the same layout as the project commits view The commits and diffs are now in separate tabs, as used in the merge request view

Updated issuable form to only show create links if allowed, and added contribution guide url to form actions.

Also changed icon for labels. Removed contribution guide notice from issue form.

Prevent content overflow for notes

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix HipChat Server

Move user key manipulation in admin section to a separate controller.

Add group filtering by name for API

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Helper for ajax group selectbox

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Group selectbox js

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Fix the ssh keys test.

Update branch api not found messages to 'Branch not found'.

Clearer message if adding comment to commit via api fails.

Message for api files and groups.

Forward the messages in api response.

Fix api tests.

Improve accept mr widget UI

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Make blob new and edit file editors more uniform

Add tests for disabled blob edit button cases.

Fixed issue not being able to create a new issue on an empty project.

Fix tests

Signed-off-by: Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com

Flatten the directory hierarchy while there is only one directory descendant

Append in place for strings and arrays

Change always passing visible true tests to false.

Raise group avatar filesize limit to 200kb, fixes #8527 (closed)

make sure the user.name is escaped

Signed-off-by: Jeroen van Baarsen jeroenvanbaarsen@gmail.com

Use plural instead of refering explicitly to male/female.

Updated CHANGELOG to include changes for 7.5.1-3

fix the wacky dashboard intro icon styling [ci skip]

fix event-last-push message's styling on mobile [ci skip]

removing padding on form-actions when in mobile size [ci skip]

Document Redis session cleanup

Restyle and refactor dashboard projects page filtering

Refactor merge request merge service

• Add system note when user merges MR in same way as it closes it
• Remove duplicating code

Ooops! Removing debug line :)

Improve mr refresh service tests

Add a message when unable to save an object through api.

Fix failing tests due to updates on the return messages.

GitLab does not work well with Ruby 2.2 yet

User interface text guideline added.

Cleanup and refactor release doc. Follow issue as a todo list

Improve monthly.md with fixes proposed from @sytse

Improve monthly.md with fixes proposed from Sytse

Improve monthly.md with fixes proposed from Sytse

Make automerge via satellite

Github Importer

Add test spec for TreeHelper module

updated master to latests sha

Replace befor with before

Make ordered lists for release doc

If noteable is nil - make discussion outdated

Small spelling improvements.

rspec fix

point to a specific branch in the test repo to avoid conflicts

Fix randomly failing test

Execute GitLab CI on tag push

Add flatten-dir branch to seed repo

Refactor push data builder. Moved it to separate class

Also execute GitLab CI on creating tag via UI

Fix ci data in hook when create git tag via UI

Rename the checkbox css class to prevent it from being overwritten by the same named bootstrap class.

remove duplication by linking EE features directly to website

Fix test hook and tests

First entry in wiki history leads to newest revision.

Scroll the readme anchors below the navbar.

When anchor is clicked set the correct condition.

revise wording to clarify CE and EE definitions

Get rid of here links and simplify text.

Link to guidelines for interface text.

Improve import page

Update db schema

Improve github import page UI

Add support for colored header on Android Lollipop with Chrome

Revert "When anchor is clicked set the correct condition."

This reverts commit 5140bd88.

Revert "Scroll the readme anchors below the navbar."

This reverts commit b1792d9e.

Create update doc for 7.7

Update guides for CE

Remove bold text

Fix code block in rc1 doc

Update the Omnibus package in Dockerfile

From 7.5.3 to 7.6.2.

Signed-off-by: kfei kfei@kfei.net

Fix anchors being hidden under fixed navbar issue

Make view link come first so I don't have to mouse to the end of the email line.

Fix image drag-n-drop to diff comments

Explicitly enable drag-n-drop for issue/mr/wiki markdown forms

Fix specs

Comment broken test because I dont have time to improve it

Updated gollum-libs

I did this commit in an earlier revision of my pull request. As reverting this commit later caused failing tests I decided to include it again.

Fixed tests

Send checkout sha for web hooks and services

Test git builder over annotated tag

Increase font size for lists

Re-order admin dashboard

Better label for diffs

Fix the email variable substituation in ssh help page

Fix shell version in manual installation doc

Fix tests

Add description attribute to group API (GET and POST)

Document the description attribute of groups API

Update import.md documentation to specify correct directory ownership and permissions.

Fixes the sort dropdown goind outside of the screen

see gitlab-org/gitlab-ce#986

Add placeholders to hipchat service

Update gitlab-shell in docs to 2.4.1

Add description to merge request

The description can be provided when creating or updating a merge request.

Signed-off-by: Loic Dachary loic@dachary.org

Change to single-quoted strings in help_pages_spec

Add missing krb5 devel dependency when building packages

Use new way of defining services on packager.io

Use full path from root of project.

Remove markdown syntax from config file

Fix comment text overflow and wrong margin

Improve edited ago helpers

Fix tests for edited_ago helpers

Dont allow event content to overflow it UI limits

Remove unnecessary / from avatar url

So http://localhost:3000//uploads/user/avatar/1/avatar.png becomes http://localhost:3000/uploads/user/avatar/1/avatar.png

Handle errors on API when a project does not have a repository (Closes #6289 (closed))

update documentation regarding github_importer

fix url in update doc

fix url in update doc

GitHub importer description

fix border radius top left for descriptions

Disable 'check all issues' checkbox for unprivileged users.

Disable turbolink on links pointing out to ci services

Github Importer: AJAX update status

We dont support ruby 2.2 yet

Add issue tracker services.

Redmine doesn't require title and description change

developer can push to protected branches

Add return value example to ssh key creation

Signed-off-by: Loic Dachary loic@dachary.org

Document ssh key creation error

Add the error code returned in the headers as well as an example of the JSON informative message returned in the body.

Signed-off-by: Loic Dachary loic@dachary.org

Fix spinner icon to match others

Fix the sentence on notification page.

Add per-milestone issues API call

Don't create zombies with IO.popen

The previous recommend incantation would leave the process we read from hanging around, even though it had finished. That gives you a 'defunct'/'zombie' process.

Implement edit via API for projects

Mix wrong comment about signup

Improve commit title

Update ssh doc with commands to copy the public key to the clipboard

Show modal window with instructions if GH OAuth is not enables

lighter hover color

Faster autocomplete for users/issues/emojiis

Instead of loading all issues and merge requests we load only open one. This will reduce time load for autocomplete resources significantly

Remember the project default tab for 30days

Manipulate external tracker issues urls generated from services.

Rename workflow to feature branch flow and add better desciption of workflow category.

Remove configuration option from project settings page for external issue trackers.

Faster autocomplete without unused description

Cache autocomplete or emojis

Use ruby 1.9 hash syntax

Show no-ssh error message for project page

Fix avatar indentation

Redesign services page

Fixes typo in config.rb

Fix avatar margin for project home page

Include issue/mr participants in list of recipients for close/reopen emails

Redesign way how project avatar displayed on project page

Don't require omniauth to be enabled, to use github importer

Files::CreateService can now commit file to empty repository

Make draft UI for creating new file in empty repository

Explicitly set before_filter for ref-related controllers

Refactor blob helpers

Update rspec tests to the new external issue logic.

Remove unused feature steps.

Fix tests for blobs refactoring

Fix app title when browse blob

Update semantic-ui-sass to 1.8

Prevent confusion between active users and 30 day users.

Replace p with h4 for empty repo text

Still need the javascript on the project edit page.

Add tests for initializing bare repo and creating new file in it

Increase font size for issue/mr titles

Fix random failing test

Point out common LDAP port/method combinations

Make 'plain', port 389 the default for LDAP

Project/Group access dropdown should contain link to permissions help page

Improve wording for fork project page

Fix test for merge request

Better wording

Add light border to bootstrap panels

Be more careful with parsing changes from gitlab-shell