add "Uplaod" and "Replace" functionality
- Mar 31, 2015
-
-
Jacob Vosmaer (GitLab) authored
Create _commit_message_replace_container.haml.html add commit-message container for "replace" functionality add new_tree_controller.rb 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 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
-
Jacob Vosmaer (GitLab) authored
-
Jacob Vosmaer (GitLab) authored
This reverts commit 91ee82c5.
-
Jacob Vosmaer (GitLab) authored
Conflicts: CHANGELOG
-
Jacob Vosmaer (GitLab) authored
-
Jacob Vosmaer (GitLab) authored
-
Jacob Vosmaer (GitLab) authored
Make the diff with 7.5.1 smaller.
-
Achilleas Pipinellis authored
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
-
Jacob Vosmaer (GitLab) authored
Conflicts: config/initializers/4_sidekiq.rb
-
Jacob Vosmaer (GitLab) authored
-
Jacob Vosmaer (GitLab) authored
-
Jacob Vosmaer (GitLab) authored
-
Jacob Vosmaer (GitLab) authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
- Mar 30, 2015
-
-
Dmitriy Zaporozhets authored
Added badge to commits tab Fixes #1261 See merge request !465
-
Phil Hughes authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Fix merge errors on CHANGELOG
-
Douwe Maan authored
API: Events paginate Updated the api method for /project/:id/events, to use the paginate method instead of limiting and offsetting the recent events in the method itself. This will also change the first page to be 1 instead of 0, but using 0 will still work and will give back the first page. This also add's the link headers (next/first/last). See merge request !267
-
Achilleas Pipinellis authored
Bump Docker build to GitLab v7.9.1 Upgrade GitLab from v7.9.0 to v7.9.1. See merge request !476
-
Marco Vito Moscaritolo authored
During merges (d554070a and 497fd75d) changelog was "damaged", I restored the tagged 7.9.1 and added the required changes about 7.10.0 (unreleased). I think we need to ensure all PR are rebased on master before merge.
-
Stan Hu authored
-
Robert Schilling authored
LICENSE year update
-
Andrew authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
- Mar 29, 2015
-
-
Dmitriy Zaporozhets authored
Repo buttons Fixes #796 Moved the star & fork button to inline with the other buttons. See merge request !473
-
Phil Hughes authored
-
Phil Hughes authored
Star and fork buttons moved up
-
Dmitriy Zaporozhets authored
Prevent note form from being cleared when submitting failed. When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted
See merge request !468 -
Dmitriy Zaporozhets authored
Add ActiveRecord::Migration.maintain_test_schema! to spec_helper
-
Dmitriy Zaporozhets authored
Define GIT_TEMPLATE_DIR environment variable in TestEnv
-
Dmitriy Zaporozhets authored
Refactor sidebar JS logic
-
Dmitriy Zaporozhets authored
Move asana_service_spec to its correct location
-
Dmitriy Zaporozhets authored
properly paginate project events in API
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Remove the email patches link for merge commits Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches. This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit. Together these changes should prevent the 500 errors described in the issue. cc @sytse See merge request !1737
-
Dmitriy Zaporozhets authored
We've moved external trackers to service, remove from gitlab.yml. Fixes #1937 See merge request !1743
-
Nihad Abbasov authored
-
Nihad Abbasov authored
update acts-as-taggable-on
-
- Mar 28, 2015
-
-
Nihad Abbasov authored
-
Sullivan SENECHAL authored
-
Vinnie Okada authored
-
Robert Schilling authored
Change merging notification to sound more natural
-
Robert Speicher authored
-
Robert Speicher authored
See http://schacon.github.io/git/git-init.html#_template_directory Without this variable, any global git hooks a developer might have in ~/.git_template would be linked in the `.git/hooks` folder for every test repository that gets checked out by TestEnv, and would cause certain specs to fail due to pre-existing hook files.
-
- Mar 27, 2015
-
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Improve UI for issues filters  See merge request !472
-
Steven Burgart authored
-
Robert Speicher authored
New in Rails 4.1, this eliminates spec failures due to forgetting to run `db:test:prepare`.
-
Robert Speicher authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Prevent holding Control-Enter or Command-Enter from posting comment multiple times. See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2184 See merge request !467
-
Marin Jankovski authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Robert Schilling authored
Fix typo 'projecti' to 'project' in ssh doc [ci skip] There was a typo in the SSH doc: projecti was written instead of project. See merge request !461
-
Dmitriy Zaporozhets authored
Big refactoring of issues filters * No magic numbers for issues filtering * Squash project users selectbox and users selectbox into one class * Move from API autocomplete to GitLab internal one * Smarter filter for project/group/all issues * Use selectbox with searchbox for assignee/author/milestone/label * Switch to ajax filter for issue author/assignee Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1035 See merge request !466
-
Dmitriy Zaporozhets authored
-
Phil Hughes authored
-
Dmitriy Zaporozhets authored
* Squash project users selectbox and users selectbox into one class * Move from API autocomplete to GitLab internal one * Smarter filter for project/group/all issues * Use selectbox with searchbox for assignee/author/milestone/label * Switch to ajax filter for issue author/assignee
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Marin Jankovski authored
-
Marin Jankovski authored
-
- Mar 26, 2015
-
-
Sid Sijbrandij authored
Separate Dockerfile for Data and Application This is based on #1158 Instead of creating data container from same docker image, we create separate docker image for data container to avoid keeping original docker image after upgrading to new version. (That results in 1GB space that cannot be freed) See merge request !409
-
Phil Hughes authored
-
Bart Deslagmulder authored
-
Dmitriy Zaporozhets authored
Set Application controller default URL options to ensure all url_for calls are consistent ### What does this MR do? This MR sets the app controller's `default_url_options` so that all `url_for` calls are consistent. ### Are there points in the code the reviewer needs to double check? Setting these options may simplify `url_for` calls that load the GitLab options already. I did not want to touch existing code yet. I'm also not sure if there are other options that need to be included. ### Why was this MR needed? If you run GitLab behind a reverse proxy or in a Docker container, you don't want a user to be seeing the local IP and port on which GitLab is running (e.g. 192.168.1.1:8080). Right now there are places where this internal data is leaked (e.g. see the URL in Profile Settings -> Account -> Username; this uses `user_url`). ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1249 See merge request !453
-
Dmitriy Zaporozhets authored
Fix EmailsOnPush. See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2185. See merge request !459
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Add archived status to Admin > Project page
-
Dmitriy Zaporozhets authored
Renamed Buildbox to Buildkite.
-
Dmitriy Zaporozhets authored
Change directory when removing old backups Fixes errors when deleting old backups in the `gitlab:backup:create` rake task. See #2177. See merge request !1740
-
Dmitriy Zaporozhets authored
Capitalize js class name See merge request !457
-
Keith Pitt authored
-
Hannes Rosenögger authored
Fix broken side-by-side diff view on merge request page ### What does this MR do? This MR fixes the side-by-side diff that was broken in v7.9.0. The "Inline" and "Side-by-Side" buttons are now always rendered with HTML links instead of changing depending on whether the code diff was requested in JSON format. ### Are there points in the code the reviewer needs to double check? Is there a better way to fix this? The links in JSON format may be desirable if there were a JavaScript hook to handle the buttons, but as far as I can tell there isn't at the moment. ### Why was this MR needed? The issue is that the code diffs can be generated either by the JavaScript handler or the regular HTML. With the forcing of JSON request format in 27e75344, the JavaScript handler requests the page in JSON format, which it then uses to render the page. However, this has the unintended side effect of requesting that the "Inline" and "Side-by-Side" buttons have references to a JSON-formatted link. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1294 See merge request !460
-
Dmitriy Zaporozhets authored
UI improvements * Fix diff header for discussion * Remove unused doorkeeper layout * Nicer well * Replace alerts with well where alert is not needed See merge request !458
-
Stan Hu authored
Closes #1294
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Prevent unnecessary doubling of js events on import pages and user calendar Adding document.ready in Turbolinks make duplicating of events EVERY visit of page. In example of user calendar it causes N+1 times ajax request every time you visit user page. cc @vsizov See merge request !456
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Fix code unfold not working on Compare commits page ### What does this MR do? The code unfold buttons (`...`) don't work when you go to Commits -> Compare mode. This MR fixes that. ### Are there points in the code the reviewer needs to double check? Check to make sure all the right initializers are run in the `projects:compare:xxx` case. I'm also not sure if there are other cases where a diff is shown but the code unfolding is not activated. ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? Closes #1274 See merge request !434
-
Dmitriy Zaporozhets authored
Change ordering so that confirm is removed from attrs before attempting to User.build_user Possible fix gitlab-org/gitlab-ce#1296 See merge request !445
-