summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Prevent note form from being cleared when submitting failed.clear-note-form-on-succcessDouwe Maan2015-03-272-1/+9
|
* Merge branch 'issues-filters' into 'master'Dmitriy Zaporozhets2015-03-2735-312/+299
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix tests and unassigned filter for issues. Updated CHANGELOGDmitriy Zaporozhets2015-03-2711-56/+26
| |
| * Big refactoring of issues filtersDmitriy Zaporozhets2015-03-2619-244/+114
| | | | | | | | | | | | | | | | * 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
| * Refactor UsersSelect to use internal gitlab autocomplete controllerDmitriy Zaporozhets2015-03-261-6/+65
| |
| * Add autocomplete controllerDmitriy Zaporozhets2015-03-263-0/+86
| |
| * No magic numbers for issues filteringDmitriy Zaporozhets2015-03-263-7/+9
| |
* | Merge branch 'master' into 'master'Sytse (admin)2015-03-264-13/+37
|\ \ | |/ |/| | | | | | | | | | | | | | | 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
| * Separate Dockerfile for Data and ApplicationJozef Vaclavik2015-03-204-13/+37
| |
* | Merge branch 'set-default-url-options' into 'master'Dmitriy Zaporozhets2015-03-262-0/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Set Application controller default URL options to ensure all url_for calls ↵Stan Hu2015-03-252-0/+13
| | | | | | | | | | | | | | | | | | are consistent Closes #1249
* | | Merge branch 'fix-emailsonpush' into 'master'Dmitriy Zaporozhets2015-03-262-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix EmailsOnPush. See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2185. See merge request !459
| * | | Fix EmailsOnPush.fix-emailsonpushDouwe Maan2015-03-262-1/+10
| | | |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-266-2/+28
|\ \ \ \
| * \ \ \ Merge branch 'capitalize-js-class' into 'master'Dmitriy Zaporozhets2015-03-262-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capitalize js class name See merge request !457
| | * | | | Capitalize js class namecapitalize-js-classDmitriy Zaporozhets2015-03-252-2/+2
| | | | | |
| * | | | | Merge branch 'fix-side-by-side-diff' into 'master'Hannes Rosenögger2015-03-264-0/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Fix broken side-by-side diff view on merge request pageStan Hu2015-03-254-0/+26
| | |/ / / / | | | | | | | | | | | | | | | | | | Closes #1294
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-263-19/+26
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #9029 from tsigo/rs-project-adminDmitriy Zaporozhets2015-03-261-1/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add archived status to Admin > Project page
| | * | | | | | Update the "Edit Group" button class on Project Admin pageRobert Speicher2015-03-251-1/+1
| | | | | | | |
| | * | | | | | Add archived status to Admin > Project pageRobert Speicher2015-03-251-0/+5
| | | | | | | |
| * | | | | | | Merge pull request #9034 from buildkite/rename-buildbox-to-buildkiteDmitriy Zaporozhets2015-03-262-18/+20
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Renamed Buildbox to Buildkite.
| | * | | | | | Renamed Buildbox to Buildkite.Keith Pitt2015-03-262-18/+20
| | | | | | | |
* | | | | | | | Merge branch 'backup-chdir' into 'master'Dmitriy Zaporozhets2015-03-262-7/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Change directory when removing old backupsVinnie Okada2015-03-242-7/+9
| | | | | | | |
* | | | | | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-03-2611-52/+24
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Fix diff header for discussionDmitriy Zaporozhets2015-03-252-2/+8
| | | | | | | | |
| * | | | | | | | Remove unused doorkeeper layoutDmitriy Zaporozhets2015-03-252-37/+0
| | | | | | | | |
| * | | | | | | | Nicer wellDmitriy Zaporozhets2015-03-251-0/+6
| | | | | | | | |
| * | | | | | | | Replace alerts with well where alert is not neededDmitriy Zaporozhets2015-03-256-13/+10
|/ / / / / / / /
* | | | | | | | Improve protected branches page UXDmitriy Zaporozhets2015-03-251-3/+3
| | | | | | | |
* | | | | | | | Dont bind all checkboxes when you need only protected branchesDmitriy Zaporozhets2015-03-251-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'prevent-duobling-ready-events' into 'master'Dmitriy Zaporozhets2015-03-269-22/+13
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Prevent unnecessary doubling of js events on import pages and user calendarprevent-duobling-ready-eventsDmitriy Zaporozhets2015-03-259-22/+13
|/ / / / / / /
* | | | | | | Merge branch 'fix-compare-diff-unfold' into 'master'Dmitriy Zaporozhets2015-03-264-0/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | Fix code unfold not working on Compare commits pageStan Hu2015-03-244-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1274
* | | | | | | | Merge branch 'master' into 'master'Dmitriy Zaporozhets2015-03-261-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Change ordering so that confirm is removed from attrs before attempting to ↵RICKETTM@uk.ibm.com2015-03-241-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | User.build_user
* | | | | | | | Merge branch 'doc_group_permissions' into 'master'Dmitriy Zaporozhets2015-03-261-2/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [doc] Groups can be browsable if they contain at least one public project. See merge request !451
| * | | | | | | | [doc] Groups can be browsable if they contain at least one public project.Achilleas Pipinellis2015-03-251-2/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'notification_on_project_moving' into 'master'Dmitriy Zaporozhets2015-03-261-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification on project moving Moving of project should respect notification settings https://dev.gitlab.org/gitlab/gitlabhq/issues/2091 See merge request !452
| * | | | | | | | notification on project movingnotification_on_project_movingValery Sizov2015-03-251-0/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'fix-branch-contains' into 'master'Dmitriy Zaporozhets2015-03-262-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent doubling AJAX request with each commit visit via Turbolink Be careful with `document.ready` in views :smiley: cc @vsizov @marin See merge request !454
| * | | | | | | | Prevent doubling AJAX request with each commit visit via Turbolinkfix-branch-containsDmitriy Zaporozhets2015-03-252-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #9021 from nicklegr/faster_auto_mergeDmitriy Zaporozhets2015-03-252-5/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Faster merge request processing for large repository
| * | | | | | | Update CHANGELOGnicklegr2015-03-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Reset parking branch to HEAD everytimenicklegr2015-03-251-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Reduces overhead of git checkout
* | | | | | | | Merge pull request #8007 from mr-vinn/markdown-tagsDmitriy Zaporozhets2015-03-255-10/+58
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Allow HTML tags in user Markdown input
| * | | | | | | Merge branch 'master' into markdown-tagsVinnie Okada2015-03-2485-530/+829
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
View Lorry Controller Status