Commit Graph
3187 Commits
Author SHA1 Message Date
Douwe Maan 59e62fc486 Merge branch 'docker-registry' into 'master'
Added authentication service for docker registry

This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes.

I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry?

What do you think @jacobvosmaer @sytses @marin?

cc @marin 

See merge request !3787
2016-05-16 17:20:31 +00:00
Douwe Maan 876dc7bacb Rename diff_with_notes partial. 2016-05-13 17:31:59 -05:00
Douwe Maan e0bb169ae3 "the outdated diff" -> "an outdated diff" 2016-05-13 17:31:58 -05:00
Douwe Maan 7848d54f5b Clean up LegacyDiffNote somewhat 2016-05-13 17:31:58 -05:00
Douwe Maan 9a3ed265e9 Use @diff_notes_disabled instead of @comments_allowed 2016-05-13 17:31:58 -05:00
Douwe Maan 99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry
# Conflicts:
#	config/initializers/1_settings.rb
2016-05-13 17:14:46 -05:00
Robert Speicher 5186f6e3bd Merge branch 'default-scope-on-builds-page' into 'master'
Fix a description for default scope on builds

Should be "**All* builds (from this project)" for the {project,admin}
builds page without scope.

Fix a regression on !2243 (#4240).

See merge request !4118
2016-05-12 22:01:40 +00:00
Jacob Schatz f2303f9df0 Merge branch 'send-incremental-build-log' into 'master'
Update build log incrementally

Proof of concept implementation of incremental sending of build log to browser.

cc @jschatz1 @vsizov @grzesiek @tmaczukin 


See merge request !3737
2016-05-12 16:48:42 +00:00
Takuya Noguchi 18fdbf0a03 Fix a description for default scope on builds 2016-05-13 01:28:55 +09:00
Rémy Coutable 66824e09e2 Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master'
Reuse runners edit form in admin and project area

Reuse runners edit form in admin and project area.

![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png)

See merge request !4094
2016-05-12 15:25:56 +00:00
Rémy Coutable a9cc14e08b Merge branch '3870-commit-sorting-issue' into 'master'
Group commits by date in server timezone

`Time#to_date` just takes the (timezone-less) year, date, and month, and
creates a new date from that. Because the commits in the list are
grouped by date, rather than chunked when the date changes, a commit can
be shown in the wrong order if its CommitDate has a timezone-less date
that's different to other commits around it.

Convert all CommitDates to the server timezone before grouping, as that
will at least produce consistent results. Users can still see a
timestamp on the commit that doesn't match the date it's grouped under,
because the timestamp shown uses the user's local timezone, and the
grouping uses the server's timezone, but that was an issue anyway.

### Before
![image](/uploads/1ffe0e2f86e03590cb96126d4f340436/image.png)

### After
![image](/uploads/b1be1b08782385d13c56528242a5829b/image.png)

Closes #3870 and closes #17300.

See merge request !4052
2016-05-12 14:36:15 +00:00
Sean McGivern d9574a7b93 Group commits by date in server timezone
`Time#to_date` just takes the (timezone-less) year, date, and month, and
creates a new date from that. Because the commits in the list are
grouped by date, rather than chunked when the date changes, a commit can
be shown in the wrong order if its CommitDate has a timezone-less date
that's different to other commits around it.

Convert all CommitDates to the server timezone before grouping, as that
will at least produce consistent results. Users can still see a
timestamp on the commit that doesn't match the date it's grouped under,
because the timestamp shown uses the user's local timezone, and the
grouping uses the server's timezone, but that was an issue anyway.
2016-05-11 10:26:37 +01:00
Kamil Trzcinski db25c17036 Merge remote-tracking branch 'origin/master' into send-incremental-build-log 2016-05-10 13:58:10 -05:00
Grzegorz Bizon 732e98eee7 Reuse runners edit form in admin and project area 2016-05-10 14:21:01 +02:00
Rémy Coutable 1026f2ad09 Add integration specs for tags
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-10 11:45:03 +02:00
Calin SeciuandRémy Coutable f95a8e450c Replace text field with textarea in 'New Tag' view and display tag message in <pre> 2016-05-10 11:45:03 +02:00
Kamil Trzcinski 0094d8f196 Rename images to container_registry 2016-05-09 20:29:57 +03:00
Kamil Trzcinski 71da2e0b56 Merge remote-tracking branch 'origin/master' into docker-registry 2016-05-09 20:21:02 +03:00
Kamil Trzcinski 74520f23db Encode state as base64 string 2016-05-09 20:19:27 +03:00
Kamil Trzcinski baef6728fa Send trace to a browser incrementally when build is running
We send a state of ansi2html to client, client needs to send this state back.
The state describes the configuration of generator and position within trace.
2016-05-09 19:59:45 +03:00
Rémy Coutable f5240f9703 Expose MergeRequest#user_notes_count in the API and use the method in issues list
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-09 16:08:07 +02:00
Benedikt Huss ed2a7a1ec6 Fix build notification on merge request page change even if the build status didn't change 2016-05-08 21:41:09 +02:00
Jacob Schatz 0bdb68ef60 Merge branch '15179-builds-redesign' into 'master'
15179 builds page redesign

Closes #15179   

<img src="/uploads/d9ec515e500dc9023d588b5c38636a86/Screen_Shot_2016-04-26_at_1.35.11_PM.png" width="800px">

Updated screenshot:   
<img src="/uploads/63109057ee271d788ab726e52acf9328/Screen_Shot_2016-05-04_at_9.23.01_AM.png" width="800px">

Updated screenshot with count badges instead of parentheses:  
<img src="/uploads/d9cd91b079d23c63601c8dbcf4803c8d/Screen_Shot_2016-05-05_at_7.40.48_AM.png" width="800px">

See merge request !3935
2016-05-05 13:39:28 +00:00
Annabel Dunstone 8d19955c05 Revert counter parentheses back to badges 2016-05-04 17:07:47 -05:00
Robert Speicher 915a4193b4 Merge branch 'sanitize-new-project-error-message' into 'master'
Sanitize repo paths in new project error message

Closes #17243

See merge request !4029
2016-05-04 22:03:18 +00:00
Annabel Dunstone 3a3f0bf436 Change build icons into buttons; update tests 2016-05-04 16:45:37 -05:00
Annabel Dunstone fc20639c8d Builds page redesign 2016-05-04 16:45:37 -05:00
Annabel Dunstone 7878eb9fa6 Start builds redesign 2016-05-04 16:45:37 -05:00
Stan Hu 75523d1df9 Sanitize repo paths in new project error message
Closes #17243
2016-05-04 14:06:07 -07:00
Dmitriy Zaporozhets 268868bcf0 Improve milestone page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-03 13:21:09 +02:00
Gabriel Mazetto 00ced598ea Added UI to define secret_token for webhook and systemhook
Codestyle changes to easy EE merge
2016-05-02 10:32:01 -03:00
Kamil Trzcinski 03b3fe13f6 Make images_enabled configurable 2016-04-29 16:45:00 +02:00
Rémy Coutable bfc6a0e371 Merge branch 'gitattributes' into 'master'
Support supressing text file diffs on the default branch with .gitattributes

This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch.

When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed.

![image](/uploads/2e119b725875a301e30d9ad482e283b3/image.png)

I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`.

Fixes and closes gitlab-org/gitlab-ce#2315.

See merge request !3806
2016-04-29 12:40:13 +00:00
Matt Oakes 28dcdb2779 Support supressing text file diffs on the default branch with .gitattributes
This is a combination of 3 commits.

- Update the bare repositories info/attributes if the default branch is updated
- Check the diff attributes of a file before showing a diff
- Update CHANGELOG
2016-04-29 12:45:15 +01:00
Arinde Eniola ded3b02f33 Use a better message when milestone is newly created
make some changes for the checks to determine when the messages should be displayed

add item to changelog and also integration test

make some changes to the test

make some changes
2016-04-29 10:15:49 +01:00
Robert Speicher 10f84f99cb Merge branch 'zj-large-files-no-highlight' into 'master'
Properly handle bigger files

Closes #3967

See merge request !3718
2016-04-28 21:33:50 +00:00
Jacob Schatz 73990df32f Merge branch 'async-new-branch-button' into 'master'
Load the "New Branch" button asynchronously

Here's how it looks like for logged in users:

![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif)

And here it is for anonymous users (or when a new branch can't be created by a logged in user):

![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif)

See merge request !3855
2016-04-28 21:00:22 +00:00
Jacob Schatz 9bccb4c951 Merge branch 'protected-branches-ui' into 'master'
Protected branches UI

![Screen_Shot_2016-04-26_at_15.50.10](/uploads/4b905db031aab412bc01616e0be36c1b/Screen_Shot_2016-04-26_at_15.50.10.png)

![Screen_Shot_2016-04-26_at_15.50.00](/uploads/b09229b364ec5361fce375299d39d99c/Screen_Shot_2016-04-26_at_15.50.00.png)

Closes #14027

See merge request !3929
2016-04-28 20:17:41 +00:00
Jacob Schatz 14c2c573a3 Merge branch 'project-webhooks-ui' into 'master'
Project webhooks updated UI

Closes #13993 

![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png)

![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png)

See merge request !3922
2016-04-28 20:16:36 +00:00
Jacob Schatz bdcba43873 Merge branch 'project-deploy-keys-ui' into 'master'
Project deploy keys updated UI

Closes #13992

See merge request !3912
2016-04-28 20:16:04 +00:00
Yorick PeterseandJacob Schatz 0426647069 Load the "New Branch" button asynchronously
This button depends on Issue#can_be_worked_on? which in turn depends on
Issue#related_branches. By rendering this button asynchronously we can
finally remove all usages of Issue#related_branches and
Issue#referenced_merge_requests from the issues "show" page.
2016-04-28 16:13:48 -04:00
Zeger-Jan van de Weg ad99404d25 Properly handle bigger files 2016-04-28 21:28:39 +02:00
Jacob Schatz 48076c9808 Merge branch 'updated-triggers-ui' into 'master'
Updated triggers UI

![Screen_Shot_2016-04-27_at_14.05.35](/uploads/971bc907f62abd397368c8c088ff0cf1/Screen_Shot_2016-04-27_at_14.05.35.png)

![Screen_Shot_2016-04-27_at_14.05.32](/uploads/5e0e87998e25e7e89cdd6fb8d6035542/Screen_Shot_2016-04-27_at_14.05.32.png)

Closes #14090

See merge request !3946
2016-04-28 19:14:41 +00:00
Jacob Schatz 973b948b9e Merge branch 'project-group-ui' into 'master'
Project group UI

Closes #13991 

![Screen_Shot_2016-04-25_at_14.54.49](/uploads/e55fd1731a479d93660a1ff8359f56d6/Screen_Shot_2016-04-25_at_14.54.49.png)

See merge request !3911
2016-04-28 16:44:41 +00:00
Phil Hughes 1cf8723d2f Updated triggers UI
Closes #14090
2016-04-27 14:07:11 +01:00
Alfredo Sumaran 4d6c40df9a Hide button on mobile 2016-04-26 14:01:40 -05:00
Alfredo Sumaran 4735914031 Update syntax 2016-04-26 14:01:40 -05:00
Alfredo Sumaran f0bdf5c692 Hide whitespace toggle button for new merge requests 2016-04-26 14:01:40 -05:00
Alfredo Sumaran d8d00b5bc2 Add Hide/show whitespace changes button on diff and commit view 2016-04-26 14:01:40 -05:00