Commit Graph
23256 Commits
Author SHA1 Message Date
Zeger-Jan van de Weg 103d67768d Improve text on warning message 2016-01-26 16:56:34 +01:00
Zeger-Jan van de Weg 758177d14c Warn admin of granting admin rights during OAuth
Fixes #3951

Warning style the same as the warning a user sees on a archived project.
2016-01-26 16:56:34 +01:00
Douwe Maan a9aa97b727 Merge branch 'visibility-level-text-admin-area' into 'master'
Fix visibility level texts on application settings

Introduced by me through !2005

Before:

![Screenshot_from_2016-01-26_09-34-09](/uploads/fa3e8f2522a1d26372c7a06a81119e6f/Screenshot_from_2016-01-26_09-34-09.png)

After:

![Screenshot_from_2016-01-26_09-34-27](/uploads/7955003dd02dd5376c9966aafdf4c50b/Screenshot_from_2016-01-26_09-34-27.png)


See merge request !2611
2016-01-26 14:26:31 +00:00
Zeger-Jan van de Weg c10296f92d Fix visibility level texts on application settings
Introduced by me through !2005
2016-01-26 14:54:35 +01:00
Douwe Maan b227b9add0 Merge branch 'save-button-color-application-settings' into 'master'
Save button on app settings now btn-save

Some save buttons where `btn-primary` where throughout the application these usually are `btn-save`.

Before (Application settings)

![Screenshot_from_2016-01-26_09-44-32](/uploads/f4019349c8bac6e0c91e23252a70d334/Screenshot_from_2016-01-26_09-44-32.png)

After

![Screenshot_from_2016-01-26_09-45-20](/uploads/8e59a2b180832f44e3908b22187549af/Screenshot_from_2016-01-26_09-45-20.png)


See merge request !2612
2016-01-26 13:43:50 +00:00
Douwe Maan b6eb416389 Merge branch 'track-project-import-failure' into 'master'
Track project import failure

Fixes #12512 

This also help us on identify why the import process is returning the wrong status when the project was successfully imported. Like mentioned in the issue #12450 

See merge request !2538
2016-01-26 13:33:47 +00:00
Douwe Maan 8ab939c2c0 Merge branch 'ci/test-build-artifacts-scripts' into 'master'
Add tests for clicking a row in build artifacts browser

This adds a feature tests for clicking a row, which is handled by javascript event.

/cc @ayufan 

See merge request !2551
2016-01-26 13:32:00 +00:00
Douglas Barbosa Alexandre 4941f64653 Update CHANGELOG 2016-01-26 10:56:22 -02:00
Douglas Barbosa Alexandre b58a2e30b2 Wrap errors on GitHub importer to raise Projects::ImportService::Error 2016-01-26 10:56:22 -02:00
Douglas Barbosa Alexandre c040323419 Move Gitlab::BitbucketImport::KeyDeleter to it's own importer 2016-01-26 10:56:22 -02:00
Douwe Maan 9ae820ad2e Merge branch 'rs-issue-12677' into 'master'
Update text_color_for_bg helper to support RGB triplet color codes

Closes #12677

See merge request !2587
2016-01-26 12:02:42 +00:00
Douwe Maan 28e2d2142c Merge branch 'rs-groups-index' into 'master'
Make the `/groups` route behave as expected

The route is supposed to redirect the Groups#index request based on
whether or not a user was logged in. If they are, we redirect them to
their groups dashboard; if they're not, we redirect them to the public
Explore page.

But due to overly aggressive `before_action`s that weren't excluding (or including) the
`index` action, the request always resulted in a 404, whether a user was
logged in or not.

Closes #12660

See merge request !2580
2016-01-26 11:59:05 +00:00
Zeger-Jan van de Weg 89154880e5 Save button on app settings now btn-save 2016-01-26 10:05:28 +01:00
Stan Hu eb7f669073 Merge branch 'patch-1' into 'master'
Update Slack integration configuration

Adjusted to the current Slack version (as of I 2016).

See merge request !2595
2016-01-26 05:12:45 +00:00
Robert Speicher fa9c6fa0ca Update CHANGELOG
[ci skip]
2016-01-25 20:59:24 -08:00
Douglas Barbosa Alexandre 6dd88e090e Extract Projects::ImportService service from RepositoryImportWorker 2016-01-25 22:58:30 -02:00
Robert Speicher fd33b2cdc0 Merge branch 'fix-import-redirect-loop' into 'master'
Fix import redirect loop

Fixes #11864 

See merge request !2606
2016-01-26 00:48:56 +00:00
Douglas Barbosa Alexandre cae0929a28 Merge branch 'instrumentation-signature' into 'master'
Correct arity for instrumented methods w/o args

This should fix the problem of imports not working. See https://gitlab.com/gitlab-org/gitlab-ce/issues/12450#note_3380730 for the details/context of these changes.

See merge request !2602
2016-01-26 00:04:09 +00:00
Robert Speicher 68ad3180b3 Merge branch 'note-highlighting' into 'master'
Highlight note code and edit preview

More highlighting fixes! Highlighting wasn't applied all the way for
code in notes, diff notes diffs and diff preview (on the file edit page).

The CSS changes further unify the styling for file-content highlighting,
diff highlighting and note code highlighting.

See merge request !2594
2016-01-25 23:43:44 +00:00
Robert Speicher 5516d2e4ee Merge branch 'rs-rails-security' into 'master'
Update rails, rails-html-sanitizer, and nokogiri for security fixes

See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643

See merge request !2603
2016-01-25 23:22:24 +00:00
Achilleas Pipinellis d369cd292e Merge branch 'doc_refactor_jira' into 'master'
Refactor JIRA documentation

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12680

## TODO

- [x] Move JIRA docs from `integration/` to `project_services/`
- [x] Split old JIRA info
- [x] Add note on document migration
- [x] Change references to new location
- [x] Add new images
- [x] Clean-up `jira.md`

See merge request !2592
2016-01-25 23:04:08 +00:00
Douglas Barbosa Alexandre 46c36e0e01 Fixi import redirect loop 2016-01-25 21:00:23 -02:00
Achilleas Pipinellis 229845947f Add minimum required GitLab version
[ci skip]
2016-01-25 23:59:49 +01:00
Achilleas Pipinellis fbc988de54 Remove old JIRA reference 2016-01-25 23:59:28 +01:00
Robert Speicher 47ff1c5608 Add temporary monkey patch to get specs passing on 4.2.5.1 2016-01-25 14:53:28 -08:00
Achilleas Pipinellis 81d79c7f0a Fix typos, grammar and styling 2016-01-25 23:52:04 +01:00
Sytse Sijbrandij 44275041c8 Merge branch 'mention_rouge_in_docs' into 'master'
Add references to the rouge gem library

Give the props to this awesome library we use
for syntax highlighting.

See merge request !2605
2016-01-25 21:49:21 +00:00
Robert Speicher 991cd07619 Merge branch 'prioritize-previewable-over-plain-readmes' into 'master'
Prioritize previewable over plain README files

Fixes #12441

See merge request !2521
2016-01-25 21:42:53 +00:00
Achilleas Pipinellis 6292ddd198 Add references to the rouge gem library
[ci skip]
2016-01-25 22:36:44 +01:00
Robert Speicher 484d14680d Update rails, rails-html-sanitizer, and nokogiri for security fixes
See https://dev.gitlab.org/gitlab/gitlabhq/issues/2643
2016-01-25 13:34:13 -08:00
Achilleas Pipinellis c53aad315f Add proper screenshot and comment on the output
[ci skip]
2016-01-25 22:17:41 +01:00
Robert Speicher 08755f6410 Merge branch 'rm-depr-forum-promolink' into 'master'
Substituted deprecated forum link with project issues link.

Within the promo partial template we had a Requests link to the
deprecated Forum which is now directing to the project's Issue page.

See merge request !2255
2016-01-25 20:47:51 +00:00
Yorick Peterse b74308c0a7 Correct arity for instrumented methods w/o args
This ensures that an instrumented method that doesn't take arguments
reports an arity of 0, instead of -1.

If Ruby had a proper method for finding out the required arguments of a
method (e.g. Method#required_arguments) this would not have been an
issue. Sadly the only two methods we have are Method#parameters and
Method#arity, and both are equally painful to use.

Fixes gitlab-org/gitlab-ce#12450
2016-01-25 21:28:59 +01:00
Achilleas Pipinellis 6c46b79d9a Fix sub-heading
[ci skip]
2016-01-25 20:36:12 +01:00
Achilleas Pipinellis 0fcf3adabb JIRA doc clean-up [ci skip]
- Add GitLab configuration steps
- Add example workflow
- Replace old images with new ones
2016-01-25 20:29:52 +01:00
Jose Torres 26e31f5820 Substituted deprecated forum link with project issues link. [ci skip] 2016-01-25 13:10:11 -06:00
Jacob Schatz 8b3285bfdf Merge branch 'top-search-colors-and-element-position-is-not-like-in-design' into 'master'
Adds base64 background search icon.

All inputs of type `search` will have the gray background
and search icon centered.
Because the search magnifier is a bg image,
I had to hide it with `[value=""]`.
I added a little javascript to make sure each input always has it's
own `value`.

A text and icon placeholder in the center of the input that disappears when typed is only possible with javascript. If you just want the icon or just the text it can be done with css alone.
If you want the icon/text justified left, then the search magnifier does not have to disappear. 

Fixes #11870 

cc @skyruler @creamzy 

![searchinput](/uploads/136ab91d4ff9ce717979d0ce1a23ab03/searchinput.gif)


See merge request !2546
2016-01-25 18:13:47 +00:00
Douglas Barbosa Alexandre 1aa82dc459 Prioritize previewable over plain README files 2016-01-25 11:27:07 -02:00
Marcin Zajączkowski 468dbfe937 Update Slack integration configuration 2016-01-25 13:06:09 +00:00
Achilleas Pipinellis d5fc2e9ded Add steps on configuring JIRA
[ci skip]
2016-01-25 13:48:36 +01:00
Valery Sizov 0f13933175 Merge branch 'rails_update' into 'master'
Rails updated to 4.2.5

I hope it'll fix weird spec failing (according to https://github.com/rails/rails/pull/22383)

@dzaporozhets @yorickpeterse 

See merge request !2591
2016-01-25 11:11:02 +00:00
Douwe Maan 40d2daed89 Highlight note code and edit preview 2016-01-25 11:42:47 +01:00
Kamil Trzciński b6600debd0 Merge branch 'install-unzip' into 'master'
Install unzip in build environment [ci skip]



See merge request !2593
2016-01-25 09:59:53 +00:00
Kamil Trzcinski 25bde645d8 Install unzip in build environment [ci skip] 2016-01-25 10:59:01 +01:00
Douwe Maan 0f2a906211 Merge branch 'update-gitlab-git' into 'master'
Update gitlab_git & use new method for counting branches

Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62

Fixes #12418 

See merge request !2535
2016-01-25 09:35:54 +00:00
Valery Sizov 4cfa119d5b rails updated to 4.2.5 2016-01-25 11:13:40 +02:00
Achilleas Pipinellis 5637423c69 Split JIRA configuration for GitLab < 7.8 and > 7.8
[ci skip]
2016-01-25 10:08:44 +01:00
Achilleas Pipinellis 3629984b96 Move JIRA from integration to project_services 2016-01-25 10:08:11 +01:00
Jacob Schatz a80d55b766 Border radius to vars.
Only top search is gray.
2016-01-24 20:20:03 -05:00
Jacob Schatz c10705c59f Distinguishes between search inputs.
Main search input has different styles than secondary search inputs.
2016-01-24 20:20:03 -05:00