Ben Ford and Douwe Maan
3be9d2c422
Add ability to create directories in the editor
...
Simply type a name with a `/` directory separator and new directories
will be created. This does not do the fancy UI work that github.com
does, but it will get the job done.
I could not find tests for file creation, so I didn't add a test for
this slight behaviour modification. I did test directory traversals
though, using both absolute paths like `/tmp/foo.txt` and relative paths
like `../../foo.txt`. Neither case escaped the repository, though
attempting to traverse with a relative path resulted in a 500 error that
did not affect application stability upon reload.
2015-10-29 15:49:07 +01:00
Dmitriy Zaporozhets
7b06c83cf7
Add tests for MR index page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-10-23 17:01:25 +02:00
Han Loong Liauw
1565a95da1
Merge branch 'master' into add-dates-snippets-show
2015-10-17 09:30:43 +11:00
Dmitriy Zaporozhets
d1450af81f
Add tests for last commit info on project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-10-16 10:10:33 +02:00
Han Loong Liauw
45e11d95f2
fix spinach features to use new button wordings
...
Also fixed an accidental deletion of pratial
2015-10-15 17:59:17 +11:00
Stan Hu
d02d02c672
Fix error preventing displaying of commit data for a directory with a leading dot
...
Closes https://github.com/gitlabhq/gitlabhq/issues/8763
2015-10-12 22:24:19 -07:00
Stan Hu
0ab6ca93aa
Add directory feature button
...
Change "+" icon under "Files" section to have three options:
* Create file
* Upload file
* New directory
Upload file is no longer accessible from the "Create file" page.
Users can now select a target branch in upload file as well.
Closes #2799 : Fixes a bug where file modes were overwritten after a commit
Closes https://github.com/gitlabhq/gitlabhq/issues/8253 : Existing files
can no longer be overwritten in the "Create file" section.
Closes #2557
2015-10-07 04:22:55 -07:00
Dmitriy Zaporozhets
697b34d786
Render CI statuses on commit page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-10-06 16:10:17 +02:00
Valery Sizov
731b860976
Hide password in the service settings form
2015-10-02 12:48:57 +03:00
Dmitriy Zaporozhets
46503b789d
Fix invalid tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-30 15:29:52 +02:00
Dmitriy Zaporozhets
2be714dcf6
Show CI status on commit page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-24 11:40:48 +02:00
Dmitriy Zaporozhets
eae27d1ecb
Move CI charts to project graphs area
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-23 16:24:46 +02:00
Douwe Maan
183892fde9
Merge branch 'notification-levels' into 'master'
...
Notification levels can now be set on the Project's main page
The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.
Saving is done via a remote form submission and if successful shows the user a flash message:
@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.
@rspeicher hopefully we can include it with the 8.0 release, maybe?
/cc @darby
See merge request !1322
2015-09-21 09:19:32 +00:00
Stan Hu
f481637245
Merge branch 'fix-issue-2382' into 'master'
...
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity
Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".
Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:
Closes #2382
See merge request !1227
2015-09-17 08:04:37 +00:00
Patricio Cano
1ddefa3bea
Merge branch 'master' into notification-levels
2015-09-16 19:54:18 -05:00
Patricio Cano
de1ffce739
Added Spinach tests and updated CHANGELOG
2015-09-16 18:03:48 -05:00
Stan Hu
d9af6f79ed
Change the replace placeholder to use the filename
...
Dynamically adjust placedholder for uploads and fix Dropzone event handlers
Override error handler to prevent error messages from being inserted underneath image preview
Fix tests
Use regexp instead of startsWith for better browser compatibility
Remove duplicate code in _replace.html.haml and use one template
Remove files upon error and retain alert messages until user adds a new file
2015-09-15 13:07:32 -07:00
Stan Hu
d3d03d1362
Create a "destroyed Milestone" event and keep Milestone events around in the DB
...
for posterity.
Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".
Add "in" preposition when creating and destroying milestones
Closes #2382
2015-09-15 05:51:11 -07:00
liyakun
e2ece2bc35
Add "Replace" and "Upload" features
...
Refactor upload and replace functionality
Rename file and move CSS
Fix typo
Make dropzone a div
Remove unnecessary file
Change color of "upload existing one"
Add missing changes
2015-09-15 02:12:56 +02:00
Stan Hu
fbb891c8f3
Fix broken Wiki Page History
...
Closes #2104
Closes #1751
Closes #1592
Closes https://github.com/gitlabhq/gitlabhq/issues/9399
2015-09-01 23:29:27 -07:00
Dmitriy Zaporozhets
ef0149dd44
Merge branch 'enable_ssl_verification_web_hook' into 'master'
...
Enable SSL verification for Webhooks
https://dev.gitlab.org/gitlab/gitlabhq/issues/2121
See merge request !1135
2015-08-26 16:06:02 +00:00
Valery Sizov
bafffb2d14
Enable SSL verification for Webhooks
2015-08-26 15:48:31 +03:00
Stan Hu
3bee4a6712
Fix "Reload with full diff" URL button in compare branch view
...
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
2015-08-24 23:35:26 -07:00
Stan Hu
369275d630
Fix network graph when branch name has single quotes
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
2015-07-29 23:29:47 -07:00
Stan Hu
562242cb9d
Fix commit data retrieval when branch name has single quotes
...
Closes #1724
2015-07-26 03:47:01 -07:00
Stan Hu
df2bb60f90
Add support for destroying project milestones
...
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
2015-07-17 06:54:32 -07:00
Dmitriy Zaporozhets
4dfded8934
Make left menu more hierarchical and less contextual by adding back item at top
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-10 13:29:46 +02:00
Dmitriy Zaporozhets
a0b9fe1288
Fix project tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-08 20:22:42 +02:00
Dmitriy Zaporozhets
0ebe8be02d
Fix schortcut tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-08 17:36:31 +02:00
Dmitriy Zaporozhets
39a4bb2abd
Cleanup and some test fixes after refactoring project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-08 16:55:04 +02:00
Dmitriy Zaporozhets
8404ab46b9
Add shortcut for project activity page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-07-08 12:43:46 +02:00
Robert Speicher
9cc00aa501
Fix "Project Forked Merge Requests" scenario
2015-06-26 22:41:02 -04:00
Dmitriy Zaporozhets
06ab7d89f9
Merge branch 'rs-issue-1887' into 'master'
...
Reorder MergeRequestTabs constructor
The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.
Fixes #1887
See merge request !892
2015-06-26 16:17:07 +00:00
Robert Speicher
e14d517b61
Fix merge request diff features
2015-06-25 21:30:18 -04:00
Dmitriy Zaporozhets
304386aa02
Write test for submitting issue as guest
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-06-25 16:38:14 +02:00
Dmitriy Zaporozhets
b902a9b83d
Merge branch 'split-tests' into 'master'
...
Split rspec and spinach tests in parallel
For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386
See merge request !874
2015-06-23 15:17:11 +00:00
Dmitriy Zaporozhets
12e0998635
Refactor rake tasks for tests
2015-06-23 16:48:52 +02:00
Stan Hu
555fd0cf4a
Fix downloading of patches on public merge requests when user logged out
...
Closes #1225
Closes #1854
Closes #1858
2015-06-23 05:34:21 -07:00
Dmitriy Zaporozhets
cc9b5c49d1
Merge branch 'revert-mr-state-names'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
features/steps/project/merge_requests.rb
2015-06-22 15:43:09 +02:00
Robert Speicher and Dmitriy Zaporozhets
afec5efc7d
Fix features syntax
2015-06-22 12:13:45 +02:00
Dmitriy Zaporozhets
7524d7c082
Revert merge request states renaming
...
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-06-19 17:09:50 +02:00
Robert Speicher
1f88d9b56f
Remove "Multiselect Blob" feature specs
...
These are well covered by the new Jasmine tests, and faster!
2015-06-19 04:31:24 -04:00
Stan Hu
a7932fe2fd
Support commenting on a diff in side-by-side view
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-06-16 06:11:59 -07:00
Nicolas
ebe4963871
Move Project Members link from Settings to main menu.
...
Addresses #2278 .
2015-06-09 14:45:38 +02:00
Stan Hu
5e4384ec9b
Support editing target branch of merge request
...
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
2015-05-29 04:08:08 -07:00
Stan Hu
ab88b7da19
Fix project snippets button appearing when it is disabled
...
Closes #1705
2015-05-27 05:07:44 -07:00
Dmitriy Zaporozhets
9eec0d5436
Merge branch 'accepted-rejected-mrs' into 'master'
...
Add Accepted and Rejected tabs to MR lists.
Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201 .
See merge request !702
2015-05-27 11:40:36 +00:00
Jeroen van Baarsen
b16aad9dd1
Validate wiki page creation
...
**What does this do?**
It adds validation to the creation of a wiki page, that way the user gets real
feedback instead of just a 404 page if the name of the wiki page was invalid
**Why is this needed?**
There are a lot of characters that are not allowed in the creation of a wiki
page, there is even a small text that is saying: Please don't use spaces.
Although we have that text there, we don't actually validate on this. This
commit adds validation on the title and gives the user actual feedback.
**What issues does this fix?**
Fixes http://github.com/gitlabhq/gitlabhq/issues/5357
Fixes https://github.com/gitlabhq/gitlabhq/issues/8565
Fixes https://github.com/gitlabhq/gitlabhq/issues/3913
Fixes https://github.com/gitlabhq/gitlabhq/issues/8166
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com >
2015-05-26 19:01:11 +02:00
Douwe Maan
7df45882a9
Update specs.
2015-05-25 18:37:38 +02:00
Stan Hu
a7d8a7bd3d
Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings
...
Closes #1676
2015-05-25 06:16:33 -04:00
Ben FordandDouwe Maan
Dmitriy Zaporozhets
Han Loong Liauw
Stan Hu
Valery Sizov
Patricio Cano
liyakun
Robert Speicher
Nicolas
Jeroen van Baarsen
