home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 20:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,237 Commits 48 Branches 340 Tags
9b7dd5a4ee2fee8f57a720c6942a0126b982cfcf
Commit Graph
23237 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Schatz 9b7dd5a4ee Makes ol margin big enough for 3 digits. 
Fixes #7960
 2016-01-25 23:20:31 -05: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
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
Jacob Schatz dd8e9a28e7 Removes extra spaces 2016-01-24 20:20:03 -05:00
Jacob Schatz 75c93bb20d Make base64 image smaller by 5000 characters. 2016-01-24 20:20:03 -05:00
Jacob Schatz d3f24a2221 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.
 2016-01-24 20:20:03 -05:00
Achilleas Pipinellis 07ee83932f Merge branch 'doc_artifacts' into 'master' 
Add note on artifacts browser functionality

Based on the following comment:
https://gitlab.com/gitlab-org/gitlab-ce/issues/12634#note_3359006

See merge request !2586
 2016-01-24 21:53:17 +00:00
Achilleas Pipinellis 5c69560a2d Add note on artifacts browser functionality 
Based on the following comment:
https://gitlab.com/gitlab-org/gitlab-ce/issues/12634#note_3359006

[ci skip]
 2016-01-24 22:49:37 +01:00
Achilleas Pipinellis e9eece1d44 Merge branch 'doc_omniauth' into 'master' 
Move supported omniauth providers to the top



See merge request !2585
 2016-01-24 20:39:54 +00:00
Achilleas Pipinellis 040fb46dc7 Move supported omniauth providers to the top 
[ci skip]
 2016-01-24 21:38:39 +01:00
Achilleas Pipinellis c3cc63beb6 Merge branch 'doc_integration_imgs' into 'master' 
Move all integration docs images in a single directory



See merge request !2584
 2016-01-24 20:28:08 +00:00
Achilleas Pipinellis 6f615500a9 Move all integration docs images in a single directory 
[ci skip]
 2016-01-24 21:22:19 +01:00
Achilleas Pipinellis 97b2d78de8 Merge branch 'doc_refactor_system_hooks_api' into 'master' 
Refactor system_hooks API documentation



See merge request !2475
 2016-01-24 19:24:46 +00:00
Achilleas Pipinellis df4d676811 Merge branch 'doc_refactor_namespaces_api' into 'master' 
Refactor namespaces API documentation



See merge request !2472
 2016-01-24 19:23:56 +00:00
Achilleas Pipinellis 28c14ceaa2 Merge branch 'doc_refactor_README_api' into 'master' 
Refactor README API documentation

~~Waiting for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2435 to be merged.~~

See merge request !2476
 2016-01-24 19:22:42 +00:00
Achilleas Pipinellis 23a878c40c Clean up system hooks API documentation 
[ci skip]
 2016-01-24 20:20:39 +01:00
Achilleas Pipinellis 4ae7cb9a93 Merge branch 'doc_refactor_settings_api' into 'master' 
Refactor settings API documentation



See merge request !2474
 2016-01-24 18:36:51 +00:00
Achilleas Pipinellis 2b3e64a601 Clean up namespaces API documentation 
[ci skip]
 2016-01-24 19:28:24 +01:00
Achilleas Pipinellis 6cab2e4076 Merge branch 'doc_refactor_labels_api' into 'master' 
Refactor labels API documentation



See merge request !2471
 2016-01-24 16:53:46 +00:00