summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Added correct colors and styles from antetype mockup.Jacob Schatz2016-02-024-11/+12
|
* Add ajax calls to return JSONJacob Schatz2016-01-306-5/+14
| | | | | Fix subtitles on minimize. Fix styles for show.
* Add detail to collapsed iconsJacob Schatz2016-01-284-3/+44
|
* Fix icon centering on collapsed viewJacob Schatz2016-01-281-7/+6
|
* Sidebar collapse and expand work with whole page.Jacob Schatz2016-01-287-17/+108
|
* Add icon when collapsed.Jacob Schatz2016-01-282-2/+26
| | | | Hide and show icons in collapse and expanded mode.
* Add js to expand and contract side menuJacob Schatz2016-01-274-14/+39
|
* Adds prev/next buttons to top areaJacob Schatz2016-01-273-4/+33
|
* New right side gutter design.Jacob Schatz2016-01-2710-97/+155
| | | | [WIP]
* Merge branch 'rs-issue-12672' into 'master' Dmitriy Zaporozhets2016-01-271-2/+1
|\ | | | | | | | | | | | | Remove link from system hook Closes #12672 See merge request !2588
| * Remove link from system hookrs-issue-12672Robert Speicher2016-01-241-2/+1
| | | | | | | | Closes #12672
* | Merge branch 'fix/commit-status-artifacts' into 'master' Kamil Trzciński2016-01-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Use generic method to checks if artifacts are available Closes #12626 See merge request !2576
| * | Use generic method to checks if artifacts are availableGrzegorz Bizon2016-01-261-1/+1
| | |
* | | Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern in the `::reference_pattern` class method in the ExternalIssue model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used.
* | | Merge branch 'bug/jschatz1/file-browser-lines' into 'master' Dmitriy Zaporozhets2016-01-263-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug/jschatz1/file browser lines Fixes #12725 ![Screen_Shot_2016-01-26_at_11.19.39_AM](/uploads/c5f5a143926600e02de4cfc0687ed8dd/Screen_Shot_2016-01-26_at_11.19.39_AM.png) See merge request !2615
| * | | Adds margin top to readme holder so not flush.Jacob Schatz2016-01-261-0/+1
| | | |
| * | | adds border color to tables globally.Jacob Schatz2016-01-262-4/+1
| | | |
| * | | Fix border color.bug/jschatz1/file-browser-linesJacob Schatz2016-01-261-0/+1
| | | | | | | | | | | | | | | | Uses `$border-color`
| * | | Revert "Styles for file list change."Jacob Schatz2016-01-264-36/+37
| | | | | | | | | | | | | | | | This reverts commit a14089485ff697d58dddb61e6da2d1b6c64a803e.
| * | | Revert "Adjusts styles of table tree"Jacob Schatz2016-01-262-34/+10
| | | | | | | | | | | | | | | | This reverts commit 111834883d287c89a24ae395900786d771214bdb.
| * | | Adjusts styles of table treeJacob Schatz2016-01-262-10/+34
| | | | | | | | | | | | | | | | Fixes #12725
| * | | Styles for file list change.Jacob Schatz2016-01-264-37/+36
| | | | | | | | | | | | | | | | New download btn WIP.
* | | | Merge branch ↵Dmitriy Zaporozhets2016-01-261-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'search-box-in-group-members-view-is-too-small-for-placeholder-in-chrome' into 'master' Fixes: Search box in Group Members view is too small for placeholder in Chrome Fixes #2498 ![Screen_Shot_2016-01-25_at_11.55.57_PM](/uploads/de4fda98cd8552641208b3a7a9277e35/Screen_Shot_2016-01-25_at_11.55.57_PM.png) See merge request !2609
| * | | | Placeholder now visible completely.search-box-in-group-members-view-is-too-small-for-placeholder-in-chromeJacob Schatz2016-01-251-0/+10
| | |/ / | |/| | | | | | | | | | Fixes #2498
* | | | Merge branch 'using-a-or-m-hotkeys-on-issuable-tab' into 'master' Dmitriy Zaporozhets2016-01-261-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicks the edit button instead of opening the dropdown Fixes #2307 Instead of opening the menu, this clicks the `edit` button. See merge request !2607
| * | | | Clicks the edit button instead of opening the dropdownusing-a-or-m-hotkeys-on-issuable-tabJacob Schatz2016-01-251-2/+2
| |/ / / | | | | | | | | | | | | Fixes #2307
* | | | Fix visibility level texts on application settingsZeger-Jan van de Weg2016-01-261-2/+2
| | | | | | | | | | | | | | | | Introduced by me through !2005
* | | | Merge branch 'save-button-color-application-settings' into 'master' Douwe Maan2016-01-263-4/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Save button on app settings now btn-saveZeger-Jan van de Weg2016-01-263-4/+3
| |/ / /
* | | | Merge branch 'track-project-import-failure' into 'master' Douwe Maan2016-01-262-39/+74
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Move Gitlab::BitbucketImport::KeyDeleter to it's own importerDouglas Barbosa Alexandre2016-01-261-4/+0
| | | |
| * | | Extract Projects::ImportService service from RepositoryImportWorkerDouglas Barbosa Alexandre2016-01-252-39/+78
| | | |
* | | | Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-261-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update text_color_for_bg helper to support RGB triplet color codes Closes #12677 See merge request !2587
| * | | | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-241-1/+5
| | |_|/ | |/| | | | | | | | | | Closes #12677
* | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-261-4/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-231-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660
* | | | Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-261-5/+15
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix import redirect loop Fixes #11864 See merge request !2606
| * | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-251-5/+15
| | | |
* | | | Merge branch 'note-highlighting' into 'master' Robert Speicher2016-01-2516-64/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Highlight note code and edit previewnote-highlightingDouwe Maan2016-01-2516-64/+34
| | | | |
* | | | | Merge branch 'prioritize-previewable-over-plain-readmes' into 'master' Robert Speicher2016-01-251-4/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prioritize previewable over plain README files Fixes #12441 See merge request !2521
| * | | | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmesDouglas Barbosa Alexandre2016-01-251-4/+12
| |/ / / /
* | | | | Substituted deprecated forum link with project issues link. [ci skip]Jose Torres2016-01-251-3/+3
| |/ / / |/| | |
* | | | Merge branch 'top-search-colors-and-element-position-is-not-like-in-design' ↵Jacob Schatz2016-01-257-19/+49
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Border radius to vars.top-search-colors-and-element-position-is-not-like-in-designJacob Schatz2016-01-242-6/+10
| | | | | | | | | | | | | | | | Only top search is gray.
| * | | Distinguishes between search inputs.Jacob Schatz2016-01-242-7/+7
| | | | | | | | | | | | | | | | Main search input has different styles than secondary search inputs.
| * | | Removes extra spacesJacob Schatz2016-01-241-2/+0
| | | |
| * | | Make base64 image smaller by 5000 characters.Jacob Schatz2016-01-241-2/+1
| | | |
| * | | Adds base64 background search icon.Jacob Schatz2016-01-246-14/+43
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-01-251-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status